diff options
author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-07-13 06:42:23 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-13 06:42:23 +0800 |
commit | 13758074994155000d9b25dd9216c4f3117c79ad (patch) | |
tree | dd730af651805d0a77bd8a01816721f5a4b30159 /package.json | |
parent | ebe76664266d3c712ec14ac4aef7fc48b3f1b5c3 (diff) | |
parent | f82f8a9fa46d4fe59b0f9a13313a3a55ce120f28 (diff) | |
download | tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.gz tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.bz2 tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.lz tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.xz tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.zst tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.zip |
Merge branch 'master' into UpdateMetadata
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json index 8a394ad75..d3de895c3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "start": "npm run dev", "dev": "gulp dev --debug", "disc": "gulp disc --debug", - "clear": "rm -rf node_modules/eth-contract-metadata", + "clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/etheraddresslookup", "dist": "npm run clear && npm install && gulp dist", "test": "npm run lint && npm run test-unit && npm run test-integration", "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", @@ -69,6 +69,7 @@ "eth-sig-util": "^1.1.1", "eth-simple-keyring": "^1.1.1", "eth-token-tracker": "^1.1.2", + "etheraddresslookup": "github:409H/EtherAddressLookup", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", |