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/0x.js/src | |
| parent | 5468358f2142549c68ffae0085ce7d31ea271ea4 (diff) | |
| parent | 7d9c357409c25996f9c448dffd69007f69b9d8d6 (diff) | |
| download | dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.gz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.bz2 dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.lz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.xz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.zst dexon-sol-tools-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/0x.js/src')
| -rw-r--r-- | packages/0x.js/src/artifacts/TokenRegistry.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/0x.js/src/artifacts/TokenRegistry.json b/packages/0x.js/src/artifacts/TokenRegistry.json index 0f583628c..95bee4b1d 100644 --- a/packages/0x.js/src/artifacts/TokenRegistry.json +++ b/packages/0x.js/src/artifacts/TokenRegistry.json @@ -538,7 +538,7 @@ "address": "0x4e9aad8184de8833365fea970cd9149372fdf1e6" }, "42": { - "address": "0xf18e504561f4347bea557f3d4558f559dddbae7f" + "address": "0xd0a1e359811322d97991e03f863a0c30c2cf029c" }, "50": { "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082" |