aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorBruno Barbieri <bruno.barbieri@consensys.net>2018-11-22 03:45:55 +0800
committerGitHub <noreply@github.com>2018-11-22 03:45:55 +0800
commitae8626eceb255618d5cdeb5aba7ce2dd377d2c0c (patch)
tree082e495f1b6e303ca5fca54e9a186ca9ef6292ca /package.json
parent7229f0f9fcd6c2579c3c5a5146a3b144929b6d2e (diff)
parentb4d48ea3fc15541c674868a1249f4526cb4ae53c (diff)
downloadtangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.gz
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.bz2
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.lz
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.xz
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.tar.zst
tangerine-wallet-browser-ae8626eceb255618d5cdeb5aba7ce2dd377d2c0c.zip
Merge pull request #5797 from MetaMask/trezor-v6
Add Firefox and Brave support for Trezor
Diffstat (limited to 'package.json')
-rw-r--r--package.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/package.json b/package.json
index b4ae2552d..996e11193 100644
--- a/package.json
+++ b/package.json
@@ -125,9 +125,9 @@
"eth-method-registry": "^1.0.0",
"eth-phishing-detect": "^1.1.4",
"eth-query": "^2.1.2",
+ "eth-trezor-keyring": "^0.2.0",
"eth-sig-util": "^2.0.2",
"eth-token-tracker": "^1.1.5",
- "eth-trezor-keyring": "^0.1.0",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-tx": "^1.3.0",
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
@@ -264,7 +264,6 @@
"eslint-plugin-mocha": "^5.0.0",
"eslint-plugin-react": "^7.4.0",
"eth-json-rpc-middleware": "^3.1.6",
- "eth-keyring-controller": "^3.3.1",
"fetch-mock": "^6.5.2",
"file-loader": "^1.1.11",
"fs-extra": "^6.0.1",