Merge branch 'develop' into katex

2020-10-25 12:28:17 +00:00
parent 06b20fad95 646ed4c4d4
commit 4536f51ec0
157 changed files with 3749 additions and 2177 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
-  "version": "3.5.0",
+  "version": "3.6.1",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -81,7 +81,7 @@
    "linkifyjs": "^2.1.9",
    "lodash": "^4.17.19",
    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.3",
+    "matrix-widget-api": "^0.1.0-beta.5",
    "minimist": "^1.2.5",
    "pako": "^1.0.11",
    "parse5": "^5.1.1",