Merge branch 'master' into develop

2019-04-08 16:13:48 +02:00
parent de4788a3d5 21de0235b0
commit 381c2f613d
2 changed files with 8 additions and 2 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "1.0.6",
+  "version": "1.0.7",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -79,7 +79,7 @@
    "linkifyjs": "^2.1.6",
    "lodash": "^4.13.1",
    "lolex": "2.3.2",
-    "matrix-js-sdk": "1.0.3",
+    "matrix-js-sdk": "1.0.4",
    "optimist": "^0.6.1",
    "pako": "^1.0.5",
    "prop-types": "^15.5.8",