aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-10-21 03:31:40 +0800
committerkumavis <aaron@kumavis.me>2017-10-21 03:31:40 +0800
commit61e1b821d426c656922cb9e6abbf4d117497693b (patch)
treee5716845d5f5dbdb35c668a5b9d86d4103a1b7db /package.json
parent8472ca406a78468199a18c173ac8c9317dee8518 (diff)
parent2a18f732c7b31d966631507ebbaca0e6cbbaceb6 (diff)
downloadtangerine-wallet-browser-61e1b821d426c656922cb9e6abbf4d117497693b.tar
tangerine-wallet-browser-61e1b821d426c656922cb9e6abbf4d117497693b.tar.gz
tangerine-wallet-browser-61e1b821d426c656922cb9e6abbf4d117497693b.tar.bz2
tangerine-wallet-browser-61e1b821d426c656922cb9e6abbf4d117497693b.tar.lz
tangerine-wallet-browser-61e1b821d426c656922cb9e6abbf4d117497693b.tar.xz
tangerine-wallet-browser-61e1b821d426c656922cb9e6abbf4d117497693b.tar.zst
tangerine-wallet-browser-61e1b821d426c656922cb9e6abbf4d117497693b.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fix-maybe
Diffstat (limited to 'package.json')
-rw-r--r--package.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json
index 0ecd22db5..106851013 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
"eth-contract-metadata": "^1.1.4",
"eth-hd-keyring": "^1.2.1",
"eth-json-rpc-filters": "^1.2.4",
- "eth-keyring-controller": "^2.1.0",
+ "eth-keyring-controller": "^2.1.2",
"eth-phishing-detect": "^1.1.4",
"eth-query": "^2.1.2",
"eth-sig-util": "^1.4.0",
@@ -127,14 +127,14 @@
"react-markdown": "^2.3.0",
"react-redux": "^5.0.5",
"react-select": "^1.0.0-rc.2",
- "react-simple-file-input": "^1.0.0",
+ "react-simple-file-input": "^2.0.0",
"react-tooltip-component": "^0.3.0",
"readable-stream": "^2.3.3",
"redux": "^3.0.5",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.2.0",
"request-promise": "^4.2.1",
- "sandwich-expando": "^1.0.5",
+ "sandwich-expando": "^1.1.3",
"semaphore": "^1.0.5",
"sw-stream": "^2.0.0",
"textarea-caret": "^3.0.1",