Merge branch 'master' into develop

2020-09-01 17:38:21 +01:00
parent 9df5371dca d1d823dcc7
commit 52691a1a42
3 changed files with 75 additions and 6 deletions
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "3.2.0",
+  "version": "3.3.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -79,7 +79,7 @@
    "is-ip": "^2.0.0",
    "linkifyjs": "^2.1.9",
    "lodash": "^4.17.19",
-    "matrix-js-sdk": "8.2.0-rc.1",
+    "matrix-js-sdk": "8.2.0",
    "minimist": "^1.2.5",
    "pako": "^1.0.11",
    "parse5": "^5.1.1",