Merge branch 'master' into develop

CHANGES.md

@@ -1,4 +1,4 @@
-# Synapse 1.97.0rc1 (2023-11-21)
+# Synapse 1.97.0 (2023-11-28)
 
 Synapse will soon be forked by Element under an AGPLv3.0 licence (with CLA, for
 proprietary dual licensing). You can read more about this here:
@@ -10,6 +10,12 @@ The Matrix.org Foundation copy of the project will be archived. Any changes need
 by server administrators will be communicated via our usual announcements channels, 
 but we are striving to make this as seamless as possible.
 
+
+No significant changes since 1.97.0rc1.
+
+
+# Synapse 1.97.0rc1 (2023-11-21)
+
 ### Features
 
 - Add support for asynchronous uploads as defined by [MSC2246](https://github.com/matrix-org/matrix-spec-proposals/pull/2246). Contributed by @sumnerevans at @beeper. ([\#15503](https://github.com/matrix-org/synapse/issues/15503))

debian/changelog

@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.97.0) stable; urgency=medium
+
+  * New Synapse release 1.97.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 28 Nov 2023 14:08:58 +0000
+
 matrix-synapse-py3 (1.97.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.97.0rc1.

pyproject.toml

@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.97.0rc1"
+version = "1.97.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"