m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'develop' into network-remove-provider-engine

Browse Source
This commit is contained in:
kumavis 2018-07-02 21:58:29 -07:00 committed by GitHub
commit 9f29fa5c9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package-lock.json generated
View File

@ -8365,9 +8365,8 @@
} }
}, },
"eth-contract-metadata": { "eth-contract-metadata": {
"version": "1.3.0", "version": "github:MetaMask/eth-contract-metadata#2da362052a312dc6c72a7eec116abf6284664f50",
"resolved": "https://registry.npmjs.org/eth-contract-metadata/-/eth-contract-metadata-1.3.0.tgz", "from": "github:MetaMask/eth-contract-metadata#master"
"integrity": "sha1-yvPNw9aZlbbXUyydlv7brUY2HKg="
}, },
"eth-ens-namehash": { "eth-ens-namehash": {
"version": "1.0.2", "version": "1.0.2",

1
package.json
View File

@ -95,6 +95,7 @@
"eth-bin-to-ops": "^1.0.1", "eth-bin-to-ops": "^1.0.1",
"eth-block-tracker": "^4.0.1", "eth-block-tracker": "^4.0.1",
"eth-contract-metadata": "^1.1.5", "eth-contract-metadata": "^1.1.5",
"eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
"eth-hd-keyring": "^1.2.1", "eth-hd-keyring": "^1.2.1",
"eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-filters": "^2.1.1",
"eth-json-rpc-infura": "^3.0.0", "eth-json-rpc-infura": "^3.0.0",