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

2017-07-04 15:38:45 +00:00 · 2017-07-04 15:38:45 +00:00 · 8b6ed9f993
parent c6492b3d8a 48889b51b0
commit 8b6ed9f993
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -121,7 +121,7 @@
    "karma-mocha": "^0.2.2",
    "karma-phantomjs-launcher": "^1.0.0",
    "karma-webpack": "^1.7.0",
-    "matrix-mock-request": "^0.1.3",
+    "matrix-mock-request": "^1.0.0",
    "minimist": "^1.2.0",
    "mkdirp": "^0.5.1",
    "mocha": "^2.4.5",