Merge branch 'master' into develop

# Conflicts:
#	yarn.lock

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.28",
+    "version": "1.11.29",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -73,8 +73,8 @@
         "gfm.css": "^1.1.2",
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+        "matrix-js-sdk": "24.1.0",
+        "matrix-react-sdk": "3.70.0",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",