Merge branch 'master' into develop

(Releasing v0.12.0)
2018-04-11 11:32:05 +01:00
parent d877384d64 87d0c4b45a
commit 428cae34eb
2 changed files with 390 additions and 2 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "0.11.4",
+  "version": "0.12.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -72,7 +72,7 @@
    "isomorphic-fetch": "^2.2.1",
    "linkifyjs": "^2.1.3",
    "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.9.2",
+    "matrix-js-sdk": "0.10.0-rc.2",
    "optimist": "^0.6.1",
    "prop-types": "^15.5.8",
    "querystring": "^0.2.0",