aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-07-03 12:58:29 +0800
committerGitHub <noreply@github.com>2018-07-03 12:58:29 +0800
commit9f29fa5c9a7cccde8fd968533c7cbcf6aadbc180 (patch)
tree0260100f428bcea309a2051caca87709994ee9eb
parentc30ee58e61d536909131f69d52959fae928d7ba8 (diff)
parent4d9ef0dd7f3e788f7734c505b72edb4657ddec9d (diff)
downloadtangerine-wallet-browser-9f29fa5c9a7cccde8fd968533c7cbcf6aadbc180.tar
tangerine-wallet-browser-9f29fa5c9a7cccde8fd968533c7cbcf6aadbc180.tar.gz
tangerine-wallet-browser-9f29fa5c9a7cccde8fd968533c7cbcf6aadbc180.tar.bz2
tangerine-wallet-browser-9f29fa5c9a7cccde8fd968533c7cbcf6aadbc180.tar.lz
tangerine-wallet-browser-9f29fa5c9a7cccde8fd968533c7cbcf6aadbc180.tar.xz
tangerine-wallet-browser-9f29fa5c9a7cccde8fd968533c7cbcf6aadbc180.tar.zst
tangerine-wallet-browser-9f29fa5c9a7cccde8fd968533c7cbcf6aadbc180.zip
Merge branch 'develop' into network-remove-provider-engine
-rw-r--r--package-lock.json5
-rw-r--r--package.json1
2 files changed, 3 insertions, 3 deletions
diff --git a/package-lock.json b/package-lock.json
index 4a387f266..2df0697a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8365,9 +8365,8 @@
}
},
"eth-contract-metadata": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/eth-contract-metadata/-/eth-contract-metadata-1.3.0.tgz",
- "integrity": "sha1-yvPNw9aZlbbXUyydlv7brUY2HKg="
+ "version": "github:MetaMask/eth-contract-metadata#2da362052a312dc6c72a7eec116abf6284664f50",
+ "from": "github:MetaMask/eth-contract-metadata#master"
},
"eth-ens-namehash": {
"version": "1.0.2",
diff --git a/package.json b/package.json
index 7e28df8c3..0f2f5bb76 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
"eth-bin-to-ops": "^1.0.1",
"eth-block-tracker": "^4.0.1",
"eth-contract-metadata": "^1.1.5",
+ "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
"eth-hd-keyring": "^1.2.1",
"eth-json-rpc-filters": "^2.1.1",
"eth-json-rpc-infura": "^3.0.0",