aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-09-27 12:42:30 +0800
committerkumavis <aaron@kumavis.me>2017-09-27 12:42:30 +0800
commit1877c0766c1f3ab46ec89dad0200fb8f75f52bae (patch)
tree44243d257dfb7f787882578fa14df8f01900fb45 /package.json
parent443b1a8eb7883b6799692ddc24d0555d49bd1787 (diff)
parent6ca519e97c4c282023ab6b7788715ff8d7ec8189 (diff)
downloadtangerine-wallet-browser-1877c0766c1f3ab46ec89dad0200fb8f75f52bae.tar
tangerine-wallet-browser-1877c0766c1f3ab46ec89dad0200fb8f75f52bae.tar.gz
tangerine-wallet-browser-1877c0766c1f3ab46ec89dad0200fb8f75f52bae.tar.bz2
tangerine-wallet-browser-1877c0766c1f3ab46ec89dad0200fb8f75f52bae.tar.lz
tangerine-wallet-browser-1877c0766c1f3ab46ec89dad0200fb8f75f52bae.tar.xz
tangerine-wallet-browser-1877c0766c1f3ab46ec89dad0200fb8f75f52bae.tar.zst
tangerine-wallet-browser-1877c0766c1f3ab46ec89dad0200fb8f75f52bae.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController
Diffstat (limited to 'package.json')
-rw-r--r--package.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json
index 8526455e7..c3d086194 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,8 @@
"eth-phishing-detect": "^1.1.4",
"eth-query": "^2.1.2",
"eth-sig-util": "^1.2.2",
- "eth-token-tracker": "^1.1.3",
+ "eth-simple-keyring": "^1.1.1",
+ "eth-token-tracker": "^1.1.4",
"ethereumjs-tx": "^1.3.0",
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
"ethereumjs-wallet": "^0.6.0",
@@ -193,7 +194,7 @@
"react-addons-test-utils": "^15.5.1",
"react-test-renderer": "^15.5.4",
"react-testutils-additions": "^15.2.0",
- "sinon": "^3.2.0",
+ "sinon": "^4.0.0",
"tape": "^4.5.1",
"testem": "^1.10.3",
"uglifyify": "^4.0.2",