diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-11-14 05:00:52 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-11-14 05:00:52 +0800 |
commit | 8a64599ca5ad23df8f4aec0b48776c4ae5a78d83 (patch) | |
tree | ff371d3de683a4740a4fa40dbe6c4325a17c4952 /yarn.lock | |
parent | f03afe6f1b6a6bfa339507ee47b42c62550444a0 (diff) | |
parent | 5c21d3f6af2ffc513b2bbfe92abf99181a32ceca (diff) | |
download | dexon-sol-tools-8a64599ca5ad23df8f4aec0b48776c4ae5a78d83.tar dexon-sol-tools-8a64599ca5ad23df8f4aec0b48776c4ae5a78d83.tar.gz dexon-sol-tools-8a64599ca5ad23df8f4aec0b48776c4ae5a78d83.tar.bz2 dexon-sol-tools-8a64599ca5ad23df8f4aec0b48776c4ae5a78d83.tar.lz dexon-sol-tools-8a64599ca5ad23df8f4aec0b48776c4ae5a78d83.tar.xz dexon-sol-tools-8a64599ca5ad23df8f4aec0b48776c4ae5a78d83.tar.zst dexon-sol-tools-8a64599ca5ad23df8f4aec0b48776c4ae5a78d83.zip |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/different-install-wallet-copy-for-mobile
Diffstat (limited to 'yarn.lock')
-rw-r--r-- | yarn.lock | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -6786,7 +6786,7 @@ ganache-core@0xProject/ganache-core#monorepo-dep: ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default" ethereumjs-util "^5.2.0" ethereumjs-vm "2.3.5" - ethereumjs-wallet "~0.6.0" + ethereumjs-wallet "0.6.0" fake-merkle-patricia-tree "~1.0.1" heap "~0.2.6" js-scrypt "^0.2.0" |