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

2018-10-10 16:35:17 +00:00 · 2018-10-10 16:35:17 +00:00 · ae1971f5d2
parent 3488f04dd4 5c184e501d
commit ae1971f5d2
1 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -70,8 +70,8 @@
    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
    "gfm.css": "^1.1.2",
    "highlight.js": "^9.0.0",
-    "matrix-js-sdk": "0.11.1",
-    "matrix-react-sdk": "0.13.5",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
    "modernizr": "^3.6.0",
    "prop-types": "^15.6.2",
    "react": "^15.6.0",