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

2018-09-09 09:26:27 +00:00 · 2018-09-09 09:26:27 +00:00 · 370223eace
commit 370223eace
parent 85df81b220 b8bfed1308
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -73,7 +73,7 @@
    "linkifyjs": "^2.1.6",
    "lodash": "^4.13.1",
    "lolex": "2.3.2",
-    "matrix-js-sdk": "0.10.9",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
    "optimist": "^0.6.1",
    "pako": "^1.0.5",
    "prop-types": "^15.5.8",