Merge remote-tracking branch 'upstream/main' into feature_sfu

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2023-01-25 17:13:01 +01:00
parent 280058e400 0f2a62a59f
commit 3d0906a145
16 changed files with 315 additions and 148 deletions
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
    "i18next": "^21.10.0",
    "i18next-browser-languagedetector": "^6.1.8",
    "i18next-http-backend": "^1.4.4",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#278dd6a3d35cf89c03f9172f9c81579577a267b3",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#ac97928a5d081b0502952295eea5b8fa7bdf8839",
    "matrix-widget-api": "^1.0.0",
    "mermaid": "^8.13.8",
    "normalize.css": "^8.0.1",