Merge branch 'master' into develop

2024-06-18 12:22:01 +00:00
parent 15db387425 fa1d2c7dfb
commit 72354161e2
3 changed files with 227 additions and 17 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "element-web",
-    "version": "1.11.68",
+    "version": "1.11.69",
    "description": "A feature-rich client for Matrix.org",
    "author": "New Vector Ltd.",
    "repository": {
@@ -76,8 +76,8 @@
        "jsrsasign": "^11.0.0",
        "katex": "^0.16.0",
        "lodash": "^4.17.21",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+        "matrix-js-sdk": "33.1.0",
+        "matrix-react-sdk": "3.101.0",
        "matrix-widget-api": "^1.3.1",
        "react": "17.0.2",
        "react-dom": "17.0.2",