Merge branch 'master' into develop

2018-04-12 12:54:46 +01:00
parent d0827586e6 c06fc31bb2
commit 7e977d0016
2 changed files with 11 additions and 2 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "0.12.1",
+  "version": "0.12.2",
  "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.10.0",
+    "matrix-js-sdk": "0.10.1",
    "optimist": "^0.6.1",
    "prop-types": "^15.5.8",
    "querystring": "^0.2.0",