Merge branch 'master' into develop

2018-10-01 16:10:13 +02:00
parent bccfb5dafc c4d39eebe7
commit 862d67c0f7
2 changed files with 48 additions and 3 deletions
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "0.13.4",
+  "version": "0.13.5",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -75,7 +75,7 @@
    "linkifyjs": "^2.1.6",
    "lodash": "^4.13.1",
    "lolex": "2.3.2",
-    "matrix-js-sdk": "0.11.0",
+    "matrix-js-sdk": "0.11.1",
    "optimist": "^0.6.1",
    "pako": "^1.0.5",
    "prop-types": "^15.5.8",