Merge remote-tracking branch 'origin/develop' into develop

2017-10-20 16:11:10 +00:00 · 2017-10-20 16:11:10 +00:00 · 1ec995779f
parent f2e12c9edf f4e3e84765
commit 1ec995779f
2 changed files with 6552 additions and 1 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -121,7 +121,7 @@
    "karma-webpack": "^1.7.0",
    "matrix-react-test-utils": "^0.1.1",
    "mocha": "^2.4.5",
-    "parallelshell": "^1.2.0",
+    "parallelshell": "^3.0.2",
    "react-addons-test-utils": "^15.4.0",
    "require-json": "0.0.1",
    "rimraf": "^2.4.3",