Merge branch 'main' into matroska

2022-07-28 16:27:04 -04:00
parent 549c54e311 ec7f9effd8
commit 69f19d24a3
15 changed files with 352 additions and 61 deletions
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
    "classnames": "^2.3.1",
    "color-hash": "^2.0.1",
    "events": "^3.3.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#984dd26a138411ef73903ff4e635f2752e0829f2",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#8ba2d257ae24bbed61cd7fe99af081324337161c",
    "matrix-widget-api": "^0.1.0-beta.18",
    "mermaid": "^8.13.8",
    "normalize.css": "^8.0.1",