Merge branch 'master' into develop

2023-08-29 11:23:26 +01:00
parent fcd805255c 5ee16a9db1
commit 25460bd8b7
3 changed files with 30 additions and 4 deletions
--- a/yarn.lock
+++ b/yarn.lock
@@ -8861,7 +8861,7 @@ matrix-mock-request@^2.5.0:
    maplibre-gl "^2.0.0"
    matrix-encrypt-attachment "^1.0.3"
    matrix-events-sdk "0.0.1"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "28.0.0"
    matrix-widget-api "^1.5.0"
    memoize-one "^6.0.0"
    minimist "^1.2.5"