Merge branch 'master' into develop

# Conflicts:
#	package.json
#	yarn.lock

CHANGELOG.md

@@ -1,3 +1,9 @@
+Changes in [1.11.10](https://github.com/vector-im/element-web/releases/tag/v1.11.10) (2022-10-11)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes vector-im/element-web#23456.
+
 Changes in [1.11.9](https://github.com/vector-im/element-web/releases/tag/v1.11.9) (2022-10-11)
 ===============================================================================================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.11.9",
+  "version": "1.11.10",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -61,8 +61,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": "20.1.0",
+    "matrix-react-sdk": "3.58.1",
     "matrix-widget-api": "^1.1.1",
     "prop-types": "^15.7.2",
     "react": "17.0.2",

yarn.lock

@@ -8292,9 +8292,10 @@ matrix-mock-request@^2.0.0:
   dependencies:
     expect "^28.1.0"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.58.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/7c1c49540a6adb454940ce0436e7a891656b0c7c"
+matrix-react-sdk@3.58.1:
+  version "3.58.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.58.1.tgz#cf3f9bf6c2932d18c65fc1ea4a8752f78d774f4e"
+  integrity sha512-u0qPj3o4CbizYsXL3Y0sPm5h4PiZXRXwsCrSHwUvp+nrcIJHskzrAt6PZGsW/xtzQ74jdxnlbgJr4a+btGRfZQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.2.0"