From 957e93e114b2a3da09dfd666c8e96539392cc679 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 29 Nov 2022 15:43:59 +0000
Subject: [PATCH 01/12] Upgrade matrix-js-sdk to 22.0.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ac5319b7f9..ca985b82b8 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.5.25",
     "katex": "^0.16.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "22.0.0-rc.1",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^1.1.1",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 4c4c13ac06..ddeb589350 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8243,6 +8243,24 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
+matrix-js-sdk@22.0.0-rc.1:
+  version "22.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-22.0.0-rc.1.tgz#e590b204b39179cd1c48ea6d577f3ac96989a5b7"
+  integrity sha512-6BLXHle0QIpgccpFE7EQq2IhTnsbhomCx0NZJ9URIY08M2aznvVxM2XfTi+LGjRKhv7yu8TueJaW7sGlsqZ79w==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@types/sdp-transform" "^2.4.5"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    p-retry "4"
+    qs "^6.9.6"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "21.2.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b318a77ecef179a6fd288cdf32d3ff9c5e8ea989"

From bff0009b83ccb8fbb77c4e789dd9415fab1aa867 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 29 Nov 2022 15:45:28 +0000
Subject: [PATCH 02/12] Upgrade matrix-react-sdk to 3.62.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 26 +++++---------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index ca985b82b8..73231e3e5c 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "jsrsasign": "^10.5.25",
     "katex": "^0.16.0",
     "matrix-js-sdk": "22.0.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.62.0-rc.1",
     "matrix-widget-api": "^1.1.1",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index ddeb589350..8a8989920e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8261,23 +8261,6 @@ matrix-js-sdk@22.0.0-rc.1:
     sdp-transform "^2.14.1"
     unhomoglyph "^1.0.6"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "21.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b318a77ecef179a6fd288cdf32d3ff9c5e8ea989"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@types/sdp-transform" "^2.4.5"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    qs "^6.9.6"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.5.0.tgz#78da2590e82be2e31edcf9814833af5e5f8d2f1a"
@@ -8285,9 +8268,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.61.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/6ea483324eb0bd28757b2c9f964b548d423234df"
+matrix-react-sdk@3.62.0-rc.1:
+  version "3.62.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.62.0-rc.1.tgz#b8ca3e961d0967582570a2806fd6ea6c8ba9589a"
+  integrity sha512-er2Hu67yh7x5LQS2lCmhaeeo8DnSp7qr50L1pF+ElZStN8H7/8B97UfkvYycVSppayBBAMyUcP4PqGHMwZBFYw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.3.0"
@@ -8328,7 +8312,7 @@ matrix-mock-request@^2.5.0:
     maplibre-gl "^1.15.2"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "22.0.0-rc.1"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 293d119b36683f15d9af6b7d3008976f6cc47b3f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 29 Nov 2022 15:48:49 +0000
Subject: [PATCH 03/12] Prepare changelog for v1.11.16-rc.1

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b2469f358..213e6454c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+Changes in [1.11.16-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.16-rc.1) (2022-11-29)
+===========================================================================================================
+
+## ✨ Features
+ * Further improve replies ([\#6396](https://github.com/matrix-org/matrix-react-sdk/pull/6396)). Fixes #19074, #18194 #18027 and #19179.
+ * Enable users to join group calls from multiple devices ([\#9625](https://github.com/matrix-org/matrix-react-sdk/pull/9625)).
+ * fix(visual): make cursor a pointer for summaries ([\#9419](https://github.com/matrix-org/matrix-react-sdk/pull/9419)). Contributed by @r00ster91.
+ * Add placeholder for rich text editor ([\#9613](https://github.com/matrix-org/matrix-react-sdk/pull/9613)).
+ * Consolidate public room search experience ([\#9605](https://github.com/matrix-org/matrix-react-sdk/pull/9605)). Fixes #22846.
+ * New password reset flow ([\#9581](https://github.com/matrix-org/matrix-react-sdk/pull/9581)). Fixes #23131.
+ * Device manager - add tooltip to device details toggle ([\#9594](https://github.com/matrix-org/matrix-react-sdk/pull/9594)).
+ * sliding sync: add lazy-loading member support ([\#9530](https://github.com/matrix-org/matrix-react-sdk/pull/9530)).
+ * Limit formatting bar offset to top of composer ([\#9365](https://github.com/matrix-org/matrix-react-sdk/pull/9365)). Fixes #12359. Contributed by @owi92.
+
+## 🐛 Bug Fixes
+ * Fix issues around up arrow event edit shortcut ([\#9645](https://github.com/matrix-org/matrix-react-sdk/pull/9645)). Fixes #18497 and #18964.
+ * Fix search not being cleared when clicking on a result ([\#9635](https://github.com/matrix-org/matrix-react-sdk/pull/9635)). Fixes #23845.
+ * Fix screensharing in 1:1 calls ([\#9612](https://github.com/matrix-org/matrix-react-sdk/pull/9612)). Fixes #23808.
+ * Fix the background color flashing when joining a call ([\#9640](https://github.com/matrix-org/matrix-react-sdk/pull/9640)).
+ * Fix the size of the 'Private space' icon ([\#9638](https://github.com/matrix-org/matrix-react-sdk/pull/9638)).
+ * Fix reply editing in rich text editor (https ([\#9615](https://github.com/matrix-org/matrix-react-sdk/pull/9615)).
+ * Fix thread list jumping back down while scrolling ([\#9606](https://github.com/matrix-org/matrix-react-sdk/pull/9606)). Fixes #23727.
+ * Fix regression with TimelinePanel props updates not taking effect ([\#9608](https://github.com/matrix-org/matrix-react-sdk/pull/9608)). Fixes #23794.
+ * Fix form tooltip positioning ([\#9598](https://github.com/matrix-org/matrix-react-sdk/pull/9598)). Fixes #22861.
+ * Extract Search handling from RoomView into its own Component ([\#9574](https://github.com/matrix-org/matrix-react-sdk/pull/9574)). Fixes #498.
+
 Changes in [1.11.15](https://github.com/vector-im/element-web/releases/tag/v1.11.15) (2022-11-22)
 =================================================================================================
 

From 6ba67ea6418f8ca404f9019e9cbccfceeb8965d7 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 29 Nov 2022 15:48:50 +0000
Subject: [PATCH 04/12] v1.11.16-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 73231e3e5c..e23620b2a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.11.15",
+  "version": "1.11.16-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 43335ed3a1d585fd50414a7bd296aecf9fc68230 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 2 Dec 2022 16:50:35 +0000
Subject: [PATCH 05/12] Upgrade matrix-js-sdk to 22.0.0-rc.2

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e23620b2a2..a70a3e6a2a 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.5.25",
     "katex": "^0.16.0",
-    "matrix-js-sdk": "22.0.0-rc.1",
+    "matrix-js-sdk": "22.0.0-rc.2",
     "matrix-react-sdk": "3.62.0-rc.1",
     "matrix-widget-api": "^1.1.1",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 8a8989920e..617fdf0de2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8261,6 +8261,24 @@ matrix-js-sdk@22.0.0-rc.1:
     sdp-transform "^2.14.1"
     unhomoglyph "^1.0.6"
 
+matrix-js-sdk@22.0.0-rc.2:
+  version "22.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-22.0.0-rc.2.tgz#101a3bf54b67d8c96b17dbc9bfdbed8457e3b673"
+  integrity sha512-yvfIfrlemxE+fhJHlmZqvwa/NVkV0zH0H+0ktxidd5WiXExMJL07uDZd9WyCOZb3vTkcxBiSDR9UWBfLJvQdjg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@types/sdp-transform" "^2.4.5"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    p-retry "4"
+    qs "^6.9.6"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+
 matrix-mock-request@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.5.0.tgz#78da2590e82be2e31edcf9814833af5e5f8d2f1a"

From c0c84ede5d7ab8f22e4db152175e8197fb837bc3 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 2 Dec 2022 16:51:36 +0000
Subject: [PATCH 06/12] Upgrade matrix-react-sdk to 3.62.0-rc.2

---
 package.json |  2 +-
 yarn.lock    | 28 +++++-----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index a70a3e6a2a..15a9d20ff5 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "jsrsasign": "^10.5.25",
     "katex": "^0.16.0",
     "matrix-js-sdk": "22.0.0-rc.2",
-    "matrix-react-sdk": "3.62.0-rc.1",
+    "matrix-react-sdk": "3.62.0-rc.2",
     "matrix-widget-api": "^1.1.1",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 617fdf0de2..bafd915154 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8243,24 +8243,6 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-matrix-js-sdk@22.0.0-rc.1:
-  version "22.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-22.0.0-rc.1.tgz#e590b204b39179cd1c48ea6d577f3ac96989a5b7"
-  integrity sha512-6BLXHle0QIpgccpFE7EQq2IhTnsbhomCx0NZJ9URIY08M2aznvVxM2XfTi+LGjRKhv7yu8TueJaW7sGlsqZ79w==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@types/sdp-transform" "^2.4.5"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    qs "^6.9.6"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-
 matrix-js-sdk@22.0.0-rc.2:
   version "22.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-22.0.0-rc.2.tgz#101a3bf54b67d8c96b17dbc9bfdbed8457e3b673"
@@ -8286,10 +8268,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.62.0-rc.1:
-  version "3.62.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.62.0-rc.1.tgz#b8ca3e961d0967582570a2806fd6ea6c8ba9589a"
-  integrity sha512-er2Hu67yh7x5LQS2lCmhaeeo8DnSp7qr50L1pF+ElZStN8H7/8B97UfkvYycVSppayBBAMyUcP4PqGHMwZBFYw==
+matrix-react-sdk@3.62.0-rc.2:
+  version "3.62.0-rc.2"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.62.0-rc.2.tgz#bca39db7cfaed9d233fd25683a04fde22ea028cd"
+  integrity sha512-xxK6dZFPpoIREb4QXNPxeX30DWW9kJJ2cMVLrTq0hDlxNW2EtBSGUuOrCQeLpkEIGYQraCUKAPpAFETZq/L4CA==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.3.0"
@@ -8330,7 +8312,7 @@ matrix-react-sdk@3.62.0-rc.1:
     maplibre-gl "^1.15.2"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "22.0.0-rc.1"
+    matrix-js-sdk "22.0.0-rc.2"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 12bb305aa6bd1fb069c9234d7cd20722831a8ba4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 2 Dec 2022 17:00:28 +0000
Subject: [PATCH 07/12] Prepare changelog for v1.11.16-rc.2

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 213e6454c3..70f6ca2b6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.11.16-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.16-rc.2) (2022-12-02)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
+
 Changes in [1.11.16-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.16-rc.1) (2022-11-29)
 ===========================================================================================================
 

From 4376a65311fbe95ca72149d3db6c68afc351aaef Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 2 Dec 2022 17:00:28 +0000
Subject: [PATCH 08/12] v1.11.16-rc.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 15a9d20ff5..7301296b61 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.11.16-rc.1",
+  "version": "1.11.16-rc.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From d4a0046e7c8fd9e5b3ceb62c9f0b8079aff651ea Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 6 Dec 2022 12:55:51 +0000
Subject: [PATCH 09/12] Upgrade matrix-js-sdk to 22.0.0

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7301296b61..cce7353b7d 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.5.25",
     "katex": "^0.16.0",
-    "matrix-js-sdk": "22.0.0-rc.2",
+    "matrix-js-sdk": "22.0.0",
     "matrix-react-sdk": "3.62.0-rc.2",
     "matrix-widget-api": "^1.1.1",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index bafd915154..d101b66500 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8243,6 +8243,24 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
+matrix-js-sdk@22.0.0:
+  version "22.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-22.0.0.tgz#8e396a1798d6d1515a92cf8f544b0010bd0c9e85"
+  integrity sha512-mpKqeD3nCobjGiUiATUyEoP44n+AzDW5cSeBTIBY5fPhj0AkzLJhblHt40vzSOJazj8tT0PhsSzhEIR9hGzYGA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@types/sdp-transform" "^2.4.5"
+    another-json "^0.2.0"
+    bs58 "^5.0.0"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    matrix-events-sdk "0.0.1"
+    matrix-widget-api "^1.0.0"
+    p-retry "4"
+    qs "^6.9.6"
+    sdp-transform "^2.14.1"
+    unhomoglyph "^1.0.6"
+
 matrix-js-sdk@22.0.0-rc.2:
   version "22.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-22.0.0-rc.2.tgz#101a3bf54b67d8c96b17dbc9bfdbed8457e3b673"

From 2bb05080f4b94be29c126c509d21f54e895c777c Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 6 Dec 2022 12:56:23 +0000
Subject: [PATCH 10/12] Upgrade matrix-react-sdk to 3.62.0

---
 package.json |  2 +-
 yarn.lock    | 28 +++++-----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index cce7353b7d..b393c9f15a 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "jsrsasign": "^10.5.25",
     "katex": "^0.16.0",
     "matrix-js-sdk": "22.0.0",
-    "matrix-react-sdk": "3.62.0-rc.2",
+    "matrix-react-sdk": "3.62.0",
     "matrix-widget-api": "^1.1.1",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
index d101b66500..4c8edaaf19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8261,24 +8261,6 @@ matrix-js-sdk@22.0.0:
     sdp-transform "^2.14.1"
     unhomoglyph "^1.0.6"
 
-matrix-js-sdk@22.0.0-rc.2:
-  version "22.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-22.0.0-rc.2.tgz#101a3bf54b67d8c96b17dbc9bfdbed8457e3b673"
-  integrity sha512-yvfIfrlemxE+fhJHlmZqvwa/NVkV0zH0H+0ktxidd5WiXExMJL07uDZd9WyCOZb3vTkcxBiSDR9UWBfLJvQdjg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@types/sdp-transform" "^2.4.5"
-    another-json "^0.2.0"
-    bs58 "^5.0.0"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    matrix-events-sdk "0.0.1"
-    matrix-widget-api "^1.0.0"
-    p-retry "4"
-    qs "^6.9.6"
-    sdp-transform "^2.14.1"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.5.0.tgz#78da2590e82be2e31edcf9814833af5e5f8d2f1a"
@@ -8286,10 +8268,10 @@ matrix-mock-request@^2.5.0:
   dependencies:
     expect "^28.1.0"
 
-matrix-react-sdk@3.62.0-rc.2:
-  version "3.62.0-rc.2"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.62.0-rc.2.tgz#bca39db7cfaed9d233fd25683a04fde22ea028cd"
-  integrity sha512-xxK6dZFPpoIREb4QXNPxeX30DWW9kJJ2cMVLrTq0hDlxNW2EtBSGUuOrCQeLpkEIGYQraCUKAPpAFETZq/L4CA==
+matrix-react-sdk@3.62.0:
+  version "3.62.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.62.0.tgz#00e2b990d1a17f9323b7b23de6e595faf4e95041"
+  integrity sha512-uFtWPTjbbw84ouDEzyLqPuQ4ihiR9jpgP5wS40AdN+cZQZbEMH6XYT585eQPRU3ryoYK1OokPPEiz+20JkEzxg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.3.0"
@@ -8330,7 +8312,7 @@ matrix-react-sdk@3.62.0-rc.2:
     maplibre-gl "^1.15.2"
     matrix-encrypt-attachment "^1.0.3"
     matrix-events-sdk "0.0.1"
-    matrix-js-sdk "22.0.0-rc.2"
+    matrix-js-sdk "22.0.0"
     matrix-widget-api "^1.1.1"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 65dbfe4ae7aa3184f477bf4a0223c70c185dbc13 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 6 Dec 2022 12:59:53 +0000
Subject: [PATCH 11/12] Prepare changelog for v1.11.16

---
 CHANGELOG.md | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70f6ca2b6c..b6edfc16c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,5 @@
-Changes in [1.11.16-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.16-rc.2) (2022-12-02)
-===========================================================================================================
-
-## 🐛 Bug Fixes
- * Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
-
-Changes in [1.11.16-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.16-rc.1) (2022-11-29)
-===========================================================================================================
+Changes in [1.11.16](https://github.com/vector-im/element-web/releases/tag/v1.11.16) (2022-12-06)
+=================================================================================================
 
 ## ✨ Features
  * Further improve replies ([\#6396](https://github.com/matrix-org/matrix-react-sdk/pull/6396)). Fixes #19074, #18194 #18027 and #19179.
@@ -29,6 +23,8 @@ Changes in [1.11.16-rc.1](https://github.com/vector-im/element-web/releases/tag/
  * Fix regression with TimelinePanel props updates not taking effect ([\#9608](https://github.com/matrix-org/matrix-react-sdk/pull/9608)). Fixes #23794.
  * Fix form tooltip positioning ([\#9598](https://github.com/matrix-org/matrix-react-sdk/pull/9598)). Fixes #22861.
  * Extract Search handling from RoomView into its own Component ([\#9574](https://github.com/matrix-org/matrix-react-sdk/pull/9574)). Fixes #498.
+ * Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
+ * [Backport staging] Fix replies to emotes not showing as inline ([\#9708](https://github.com/matrix-org/matrix-react-sdk/pull/9708)).
 
 Changes in [1.11.15](https://github.com/vector-im/element-web/releases/tag/v1.11.15) (2022-11-22)
 =================================================================================================

From dd0134180c123fdcc677471eb0444f232d71c16d Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 6 Dec 2022 12:59:53 +0000
Subject: [PATCH 12/12] v1.11.16

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b393c9f15a..f043879e82 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.11.16-rc.2",
+  "version": "1.11.16",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {