Merge branch 'develop' of git://github.com/vector-im/riot-web into develop

2017-05-26 18:52:19 +00:00 · 2017-05-26 18:52:19 +00:00 · cd9d3ea248
parent d626542baf 963c90c833
commit cd9d3ea248
1 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -65,8 +65,8 @@
    "gfm.css": "^1.1.1",
    "highlight.js": "^9.0.0",
    "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.8",
-    "matrix-react-sdk": "0.8.9",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
    "modernizr": "^3.1.0",
    "pako": "^1.0.5",
    "q": "^1.4.1",