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

This commit is contained in:
Weblate 2017-07-04 15:38:45 +00:00
commit 8b6ed9f993

View File

@ -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",