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

This commit is contained in:
Weblate 2017-07-14 14:43:00 +00:00
commit c24b04d19b

View File

@ -120,7 +120,7 @@
"karma-junit-reporter": "^0.4.1",
"karma-mocha": "^0.2.2",
"karma-webpack": "^1.7.0",
"matrix-mock-request": "^1.0.0",
"matrix-mock-request": "^1.1.0",
"matrix-react-test-utils": "^0.2.0",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",