From ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 5 Dec 2017 13:11:59 -0330 Subject: Merge branch 'master' into NewUI-flat-merge-with-master --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package.json') 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", -- cgit v1.2.3