Merge remote-tracking branch 'upstream/livekit' into SimonBrandner/feat/friendly-url

2023-07-06 11:59:13 +02:00
parent 8fbcc06cd8 c8bf869367
commit c7258776c3
18 changed files with 251 additions and 66 deletions
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
    "i18next-http-backend": "^1.4.4",
    "livekit-client": "^1.9.7",
    "lodash": "^4.17.21",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#af10b0c44b4a427c8d2224bfd6feb03a12cfd27e",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#426d29d6b9a9d71a3c0d7fe6f7bac3473cd10832",
    "matrix-widget-api": "^1.3.1",
    "mermaid": "^8.13.8",
    "normalize.css": "^8.0.1",