Merge branch 'develop' of git://github.com/matrix-org/matrix-react-sdk into develop

2017-05-26 18:52:03 +00:00 · 2017-05-26 18:52:03 +00:00 · b5912d3c92
parent e46b63dc5a 32207bd058
commit b5912d3c92
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -64,7 +64,7 @@
    "isomorphic-fetch": "^2.2.1",
    "linkifyjs": "^2.1.3",
    "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.8",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
    "optimist": "^0.6.1",
    "q": "^1.4.1",
    "react": "^15.4.0",