diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
| commit | 2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5 (patch) | |
| tree | 60d846e22cf80416f0dd43ead8dd494c5735152f /packages/website/public/images | |
| parent | 5468358f2142549c68ffae0085ce7d31ea271ea4 (diff) | |
| parent | 7d9c357409c25996f9c448dffd69007f69b9d8d6 (diff) | |
| download | dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.gz dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.bz2 dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.lz dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.xz dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.zst dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.zip | |
Merge branch 'development' into addExtraDocs
* development: (29 commits)
Set Lodash dep to an exact version since newer versions introduced breaking changes
Update Kovan Ethertoken Address
Update deployer version since manual re-publish
Add new entry into CHANGELOG
Fix bad merge
Update yarn.lock
Change title
Add Blake and Zach to About page
Re-size Jacob and Tom's images
Manually publish 0x.js back to a working state
Publish
Publish
Fix 0x.js assets
Remove assets from connect and _bundles from packages that don't generate the folder
Publish
Fix packages that aren't working as expected
Make new packages default to public on publish
Add new public packages to top-level README
Update top-level package.json
Fix incorrect new versions
...
# Conflicts:
# packages/0x.js/package.json
# packages/connect/package.json
# packages/json-schemas/package.json
# packages/sol-cov/package.json
Diffstat (limited to 'packages/website/public/images')
| -rw-r--r-- | packages/website/public/images/team/blake.jpg | bin | 0 -> 29743 bytes |
| -rw-r--r-- | packages/website/public/images/team/jacob.jpg | bin | 1177087 -> 27088 bytes |
| -rw-r--r-- | packages/website/public/images/team/tom.jpg | bin | 41810 -> 14565 bytes |
| -rw-r--r-- | packages/website/public/images/team/zach.png | bin | 0 -> 119387 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/packages/website/public/images/team/blake.jpg b/packages/website/public/images/team/blake.jpg Binary files differnew file mode 100644 index 000000000..44ca0a311 --- /dev/null +++ b/packages/website/public/images/team/blake.jpg diff --git a/packages/website/public/images/team/jacob.jpg b/packages/website/public/images/team/jacob.jpg Binary files differindex 62ff412d2..de8b9e4b5 100644 --- a/packages/website/public/images/team/jacob.jpg +++ b/packages/website/public/images/team/jacob.jpg diff --git a/packages/website/public/images/team/tom.jpg b/packages/website/public/images/team/tom.jpg Binary files differindex a6b763816..3623a2b78 100644 --- a/packages/website/public/images/team/tom.jpg +++ b/packages/website/public/images/team/tom.jpg diff --git a/packages/website/public/images/team/zach.png b/packages/website/public/images/team/zach.png Binary files differnew file mode 100644 index 000000000..4565a9af0 --- /dev/null +++ b/packages/website/public/images/team/zach.png |
