diff options
author | Fabio Berger <me@fabioberger.com> | 2017-06-03 02:39:02 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-06-03 02:39:02 +0800 |
commit | 36e937f8de348cfdb35ff8f72504aed1dfab07b2 (patch) | |
tree | e8e0ba5b603f07bddf6cd01329e001b06b5987dd /yarn.lock | |
parent | c6ceb44682a19c9f53505803547fcb2012691b5b (diff) | |
parent | 5925f81fe185a90efaa82dd90bd8d65d74326f11 (diff) | |
download | dexon-sol-tools-36e937f8de348cfdb35ff8f72504aed1dfab07b2.tar dexon-sol-tools-36e937f8de348cfdb35ff8f72504aed1dfab07b2.tar.gz dexon-sol-tools-36e937f8de348cfdb35ff8f72504aed1dfab07b2.tar.bz2 dexon-sol-tools-36e937f8de348cfdb35ff8f72504aed1dfab07b2.tar.lz dexon-sol-tools-36e937f8de348cfdb35ff8f72504aed1dfab07b2.tar.xz dexon-sol-tools-36e937f8de348cfdb35ff8f72504aed1dfab07b2.tar.zst dexon-sol-tools-36e937f8de348cfdb35ff8f72504aed1dfab07b2.zip |
Merge branch 'master' into remainingTokenMethods
# Conflicts:
# src/contract_wrappers/token_wrapper.ts
Diffstat (limited to 'yarn.lock')
-rw-r--r-- | yarn.lock | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -914,6 +914,10 @@ chai-bignumber@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chai-bignumber/-/chai-bignumber-2.0.0.tgz#0cbf9b81790801c3f24fb77f59fa1e17a9c6e3f2" +"chai-bignumber@git+ssh://git@github.com:0xProject/chai-bignumber.git": + version "2.0.0" + resolved "git+ssh://git@github.com/0xProject/chai-bignumber.git#9ef233f3e2ca3ab250b66149390c833c117c27e7" + chai-typescript-typings@^0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/chai-typescript-typings/-/chai-typescript-typings-0.0.0.tgz#52e076d72cf29129c94ab1dba6e33ce3828a0724" |