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

This commit is contained in:
Weblate 2018-09-09 09:49:14 +00:00
commit 88cc8f89d0

View file

@ -133,7 +133,7 @@
"matrix-mock-request": "^1.2.1",
"matrix-react-test-utils": "^0.1.1",
"mocha": "^5.0.5",
"parallelshell": "^3.0.2",
"parallelshell": "3.0.1",
"react-addons-test-utils": "^15.4.0",
"require-json": "0.0.1",
"rimraf": "^2.4.3",