Merge branch 'master' into develop

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.47",
+    "version": "1.11.48",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -76,8 +76,8 @@
         "jsrsasign": "^10.5.25",
         "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": "30.0.0",
+        "matrix-react-sdk": "3.84.0",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
@@ -124,6 +124,7 @@
         "chokidar": "^3.5.1",
         "concurrently": "^8.0.0",
         "cpx": "1.5.0",
+        "cronstrue": "^2.41.0",
         "css-loader": "^4",
         "dotenv": "^16.0.2",
         "eslint": "8.52.0",
@@ -186,8 +187,7 @@
         "webpack-dev-server": "^4.15.1",
         "worker-loader": "^3.0.0",
         "worklet-loader": "^2.0.0",
-        "yaml": "^2.3.3",
-        "cronstrue": "^2.41.0"
+        "yaml": "^2.3.3"
     },
     "@casualbot/jest-sonar-reporter": {
         "outputDirectory": "coverage",