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 /yarn.lock | |
| 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 'yarn.lock')
| -rw-r--r-- | yarn.lock | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -15,6 +15,13 @@ jsonschema "^1.2.0" lodash.values "^4.3.0" +"@0xproject/types@0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.7.0.tgz#fad13925ee92ad4ee1980668a5cb2bed4dcaab8f" + dependencies: + "@types/node" "^8.0.53" + bignumber.js "~4.1.0" + "@0xproject/types@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.5.0.tgz#ba3cfbc11a8c6344b57c9680aa7df2ea84b9bf05" |