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

This commit is contained in:
Weblate 2017-11-10 15:08:53 +00:00
commit ed6d1f5a2e

View file

@ -71,7 +71,7 @@
"isomorphic-fetch": "^2.2.1",
"linkifyjs": "^2.1.3",
"lodash": "^4.13.1",
"matrix-js-sdk": "0.8.5",
"matrix-js-sdk": "0.9.0-rc.1",
"optimist": "^0.6.1",
"prop-types": "^15.5.8",
"querystring": "^0.2.0",