Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	pnpm-lock.yaml

apps/desktop/package.json

@@ -3,7 +3,7 @@
     "productName": "Element",
     "main": "lib/electron-main.js",
     "exports": "./lib/electron-main.js",
-    "version": "1.12.24",
+    "version": "1.12.25",
     "description": "Element: the future of secure communication",
     "author": {
         "name": "Element",

apps/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.12.24",
+    "version": "1.12.25",
     "description": "Element: the future of secure communication",
     "author": "New Vector Ltd.",
     "repository": {
@@ -81,7 +81,7 @@
         "lodash": "npm:lodash-es@4.18.1",
         "maplibre-gl": "^5.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-js-sdk": "42.1.0",
         "matrix-widget-api": "^1.16.1",
         "memoize-one": "^6.0.0",
         "mime": "^4.0.4",