Merge branch 'master' into develop

2019-07-18 15:51:33 +01:00
parent 6c6300e1cc 3c0c64af8e
commit 03151418af
3 changed files with 115 additions and 6 deletions
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "1.3.1",
+  "version": "1.4.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -82,7 +82,7 @@
    "linkifyjs": "^2.1.6",
    "lodash": "^4.17.14",
    "lolex": "2.3.2",
-    "matrix-js-sdk": "2.1.1",
+    "matrix-js-sdk": "2.2.0",
    "optimist": "^0.6.1",
    "pako": "^1.0.5",
    "png-chunks-extract": "^1.0.0",