diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-25 07:30:30 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-25 07:30:30 +0800 |
| commit | 35121f0b780102f0235ab3d5f26441cbb3f090e9 (patch) | |
| tree | 9f1e56a98683fbee69a6b5fc051dc81064643734 /packages/website | |
| parent | 3cc8af819c9f62f42e7cb3d03f896b35cfc10d05 (diff) | |
| parent | c4a7574f7bd3939eac9417241144197bbb22edb1 (diff) | |
| download | dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.gz dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.bz2 dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.lz dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.xz dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.zst dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.zip | |
Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash
* v2-prototype:
Temporarily disable installation tests
Pin connect in sra-report
Fix a typo
Pin types in sra-report
Fix linter issues
Unpin types version in @0xproject/connect
Pin types version in website
Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages
Migrate migrations to v2
# Conflicts:
# packages/contracts/src/utils/order_utils.ts
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/website/package.json b/packages/website/package.json index efe61c4b6..69115be9a 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -26,6 +26,7 @@ "@0xproject/subproviders": "^0.10.2", "@0xproject/contract-wrappers": "^0.0.2", "@0xproject/typescript-typings": "^0.3.2", + "@0xproject/types": "0.7.0", "@0xproject/utils": "^0.6.2", "@0xproject/web3-wrapper": "^0.6.4", "accounting": "^0.4.1", |