aboutsummaryrefslogtreecommitdiffstats
path: root/yarn.lock
diff options
context:
space:
mode:
authorDaniel Tsui <szehungdanieltsui@gmail.com>2017-10-24 19:32:19 +0800
committerGitHub <noreply@github.com>2017-10-24 19:32:19 +0800
commit09445ef692f5a63b1a4bd418962dca2892e4cda9 (patch)
tree155484d2dfade59955f888f729b631581527475e /yarn.lock
parent0a436dcf9a1283a8452966fea2508801de589ab7 (diff)
parentde3a48ec66f044d4116f8dbd25c358ab30d073a9 (diff)
downloadtangerine-wallet-browser-09445ef692f5a63b1a4bd418962dca2892e4cda9.tar.gz
tangerine-wallet-browser-09445ef692f5a63b1a4bd418962dca2892e4cda9.tar.zst
tangerine-wallet-browser-09445ef692f5a63b1a4bd418962dca2892e4cda9.zip
Merge branch 'NewUI-flat' into NewUI-flat-disable-send-next-in-error
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock14
1 files changed, 6 insertions, 8 deletions
diff --git a/yarn.lock b/yarn.lock
index ef81fe3ce..7b04eb638 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3450,9 +3450,9 @@ eth-json-rpc-middleware@^1.0.0, eth-json-rpc-middleware@^1.2.7:
promise-to-callback "^1.0.0"
tape "^4.6.3"
-eth-keyring-controller@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-2.1.1.tgz#08129c8300f0ac6de9110e0b8d51292b5c6327e3"
+eth-keyring-controller@^2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-2.1.2.tgz#1af179d8fd7ff470eb91e113a0fd3a440bd66bcc"
dependencies:
bip39 "^2.4.0"
bluebird "^3.5.0"
@@ -8540,14 +8540,12 @@ samsam@1.x, samsam@^1.1.3:
version "1.2.1"
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
-sandwich-expando@^1.0.5:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/sandwich-expando/-/sandwich-expando-1.1.1.tgz#83806fcca2375af8b6c30e6f52ed4f989debb165"
+sandwich-expando@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/sandwich-expando/-/sandwich-expando-1.1.3.tgz#6ba78d034c32f8bf5ab5934c214f8384614a88a5"
dependencies:
babel-preset-es2015 "^6.6.0"
babelify "^7.3.0"
- brfs "^1.4.3"
- raphael "^2.2.0"
react "^15.0.2"
react-dom "^15.0.2"
react-hyperscript "^2.4.0"