From c823d2e98a48ae96b4f8d8079e9c6874f8c3221a Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 30 Jul 2025 12:19:34 +0100
Subject: [PATCH] 1.135.0rc2

---
 CHANGES.md               | 13 +++++++++++++
 changelog.d/18716.bugfix |  1 -
 changelog.d/18747.misc   |  1 -
 debian/changelog         |  6 ++++++
 pyproject.toml           |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/18716.bugfix
 delete mode 100644 changelog.d/18747.misc

diff --git a/CHANGES.md b/CHANGES.md
index 673ab28a55..002373243a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,16 @@
+# Synapse 1.135.0rc2 (2025-07-30)
+
+### Bugfixes
+
+- Fix user failing to deactivate with MAS when `/_synapse/mas` is handled by a worker. ([\#18716](https://github.com/element-hq/synapse/issues/18716))
+
+### Internal Changes
+
+- Fix performance regression introduced in #18238 by adding a cache to `is_server_admin`. ([\#18747](https://github.com/element-hq/synapse/issues/18747))
+
+
+
+
 # Synapse 1.135.0rc1 (2025-07-22)
 
 ### Features
diff --git a/changelog.d/18716.bugfix b/changelog.d/18716.bugfix
deleted file mode 100644
index de7a3e39d7..0000000000
--- a/changelog.d/18716.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix user failing to deactivate with MAS when `/_synapse/mas` is handled by a worker.
diff --git a/changelog.d/18747.misc b/changelog.d/18747.misc
deleted file mode 100644
index 0ba946dd06..0000000000
--- a/changelog.d/18747.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix performance regression introduced in #18238 by adding a cache to `is_server_admin`.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 221f10ae3b..e654b05edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.135.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.135.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 30 Jul 2025 12:19:14 +0100
+
 matrix-synapse-py3 (1.135.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.135.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 11bc7277fe..d9fc84db07 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -101,7 +101,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.135.0rc1"
+version = "1.135.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"