diff options
author | Dan <danjm.com@gmail.com> | 2017-12-06 00:41:59 +0800 |
---|---|---|
committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-12-07 13:11:52 +0800 |
commit | ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7 (patch) | |
tree | 4a89f70ed4481c78628f139676f92225f60e15fe /package.json | |
parent | 2b1f2557c7dbd589724fd690ec72f789f9650e3c (diff) | |
download | tangerine-wallet-browser-ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7.tar tangerine-wallet-browser-ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7.tar.gz tangerine-wallet-browser-ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7.tar.bz2 tangerine-wallet-browser-ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7.tar.lz tangerine-wallet-browser-ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7.tar.xz tangerine-wallet-browser-ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7.tar.zst tangerine-wallet-browser-ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7.zip |
Merge branch 'master' into NewUI-flat-merge-with-master
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package.json b/package.json index 39d5df75c..72b4951db 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,7 @@ "lodash.debounce": "^4.0.8", "lodash.memoize": "^4.1.2", "lodash.shuffle": "^4.2.0", + "lodash.uniqby": "^4.7.0", "loglevel": "^1.4.1", "metamascara": "^1.3.1", "metamask-logo": "^2.1.2", @@ -126,7 +127,7 @@ "multiplex": "^6.7.0", "number-to-bn": "^1.7.0", "obj-multiplex": "^1.0.0", - "obs-store": "^2.3.1", + "obs-store": "^3.0.0", "once": "^1.3.3", "ping-pong-stream": "^1.0.0", "pojo-migrator": "^2.1.0", @@ -142,7 +143,7 @@ "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.6.2", "react-hyperscript": "^3.0.0", - "react-markdown": "^2.3.0", + "react-markdown": "^3.0.0", "react-redux": "^5.0.5", "react-select": "^1.0.0", "react-simple-file-input": "^2.0.0", @@ -160,6 +161,7 @@ "sandwich-expando": "^1.1.3", "semaphore": "^1.0.5", "shallow-copy": "0.0.1", + "semver": "^5.4.1", "sw-stream": "^2.0.0", "textarea-caret": "^3.0.1", "through2": "^2.0.3", |