diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2017-10-20 21:04:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 21:04:57 +0800 |
| commit | c24e266118b7db093a1db0b8c87c361011a16952 (patch) | |
| tree | 516bd55226d160ec888627906884933894c016a4 | |
| parent | a10a600cced6273047f224c5e19d186de091efe0 (diff) | |
| parent | 87ad6a29f09763c1fa6910b36c946dc00dcf4b6c (diff) | |
| download | tangerine-wallet-browser-c24e266118b7db093a1db0b8c87c361011a16952.tar tangerine-wallet-browser-c24e266118b7db093a1db0b8c87c361011a16952.tar.gz tangerine-wallet-browser-c24e266118b7db093a1db0b8c87c361011a16952.tar.bz2 tangerine-wallet-browser-c24e266118b7db093a1db0b8c87c361011a16952.tar.lz tangerine-wallet-browser-c24e266118b7db093a1db0b8c87c361011a16952.tar.xz tangerine-wallet-browser-c24e266118b7db093a1db0b8c87c361011a16952.tar.zst tangerine-wallet-browser-c24e266118b7db093a1db0b8c87c361011a16952.zip | |
Merge branch 'master' into i2348-SelectAccountOnNewVault
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 81515741e..6f37a5c8b 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.2", - "eth-keyring-controller": "^2.1.1", + "eth-keyring-controller": "^2.1.2", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^1.4.0", @@ -127,7 +127,7 @@ "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", |