diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-08-22 02:35:22 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-08-22 02:35:22 +0800 |
| commit | fbba3a1ac8575b910e8a2a684748d617eec19414 (patch) | |
| tree | c2940c33345d128a2888fc4441b8342e6b778d65 /package.json | |
| parent | 7ea83b6bae34dcf652d85474fe1d82893d592d55 (diff) | |
| parent | 9203b4edf9df8b616877c57970fb01a7fb87924b (diff) | |
| download | tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.gz tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.bz2 tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.lz tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.xz tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.zst tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.zip | |
Merge branch 'master' into transactionControllerRefractorPt3
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 f3cf2882a..9a09e6305 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.2.2", "eth-simple-keyring": "^1.1.1", - "eth-token-tracker": "^1.1.2", + "eth-token-tracker": "^1.1.3", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", @@ -82,6 +82,7 @@ "express": "^4.14.0", "extension-link-enabler": "^1.0.0", "extensionizer": "^1.0.0", + "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", "gulp": "github:gulpjs/gulp#4.0", "gulp-eslint": "^4.0.0", |