Merge branch 'develop' into export-conversations

2021-09-29 19:32:05 +05:30
parent f35dae8c94 f7fba91387
commit 208b914cb0
62 changed files with 936 additions and 678 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "3.30.0",
+  "version": "3.31.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {