aboutsummaryrefslogtreecommitdiffstats
path: root/yarn.lock
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-11-16 04:39:34 +0800
committerGitHub <noreply@github.com>2017-11-16 04:39:34 +0800
commitfbd04a6af6e9eda22eebaae27d712ae08272c131 (patch)
treebbb643e10e42d8113fe2d67d78efccd56b92322c /yarn.lock
parentf8d38f44c2612f0f291063814ec0e98bb4aaf4bb (diff)
parent03968ffafe27e64dcdf58764057cee1d67aa4168 (diff)
downloadtangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.tar.gz
tangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.tar.zst
tangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.zip
Merge pull request #2590 from MetaMask/merge-master
Merge master
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock4
1 files changed, 4 insertions, 0 deletions
diff --git a/yarn.lock b/yarn.lock
index 8f63c1fff..f8bd06cab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8379,6 +8379,10 @@ redux-logger@^3.0.6:
dependencies:
deep-diff "^0.3.5"
+redux-test-utils@^0.1.3:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/redux-test-utils/-/redux-test-utils-0.1.3.tgz#0d89100f100f86c7c7214976eaece88e7e45bf74"
+
redux-thunk@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"