Merge branch 'master' into develop

2020-01-27 11:46:56 +00:00
parent 1ab91d1d74 8c56c59922
commit 7a79b78292
3 changed files with 181 additions and 6 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "1.7.6",
+  "version": "2.0.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -80,7 +80,7 @@
    "is-ip": "^2.0.0",
    "linkifyjs": "^2.1.6",
    "lodash": "^4.17.14",
-    "matrix-js-sdk": "3.0.0",
+    "matrix-js-sdk": "4.0.0",
    "pako": "^1.0.5",
    "png-chunks-extract": "^1.0.0",
    "prop-types": "^15.5.8",