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

5 files changed, 20 insertions, 7 deletions

diff --git a/CHANGES.md b/CHANGES.md
index a52173609d..cac80ca972 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-# Synapse 1.98.0rc1 (2023-12-05)
+# Synapse 1.98.0 (2023-12-12)
 
 Synapse 1.98.0 will be the last Synapse release in 2023; the regular release cadence will resume in January 2024.
 
@@ -9,13 +9,20 @@ proprietary dual licensing). You can read more about this here:
  - https://element.io/blog/element-to-adopt-agplv3/
 
 The Matrix.org Foundation copy of the project will be archived. Any changes needed
-by server administrators will be communicated via our usual announcements channels, 
+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.98.0rc1.
+
+
+
+# Synapse 1.98.0rc1 (2023-12-05)
+
 ### Features
 
 - Synapse now declares support for Matrix v1.7, v1.8, and v1.9. ([\#16707](https://github.com/matrix-org/synapse/issues/16707))
-- Add `on_user_login` [module API](https://matrix-org.github.io/synapse/latest/modules/writing_a_module.html) callback allowing to execute custom code after (on) Auth. ([\#15207](https://github.com/matrix-org/synapse/issues/15207))
+- Add `on_user_login` [module API](https://matrix-org.github.io/synapse/latest/modules/writing_a_module.html) callback for when a user logs in. ([\#15207](https://github.com/matrix-org/synapse/issues/15207))
 - Support [MSC4069: Inhibit profile propagation](https://github.com/matrix-org/matrix-spec-proposals/pull/4069). ([\#16636](https://github.com/matrix-org/synapse/issues/16636))
 - Restore tracking of requests and monthly active users when delegating authentication via [MSC3861](https://github.com/matrix-org/synapse/pull/16672) to an OIDC provider. ([\#16672](https://github.com/matrix-org/synapse/issues/16672))
 - Add an autojoin setting for server notices rooms, so users may be joined directly instead of receiving an invite. ([\#16699](https://github.com/matrix-org/synapse/issues/16699))
@@ -80,7 +87,7 @@ proprietary dual licensing). You can read more about this here:
  - https://element.io/blog/element-to-adopt-agplv3/
 
 The Matrix.org Foundation copy of the project will be archived. Any changes needed
-by server administrators will be communicated via our usual announcements channels, 
+by server administrators will be communicated via our usual announcements channels,
 but we are striving to make this as seamless as possible.
 
 
diff --git a/debian/changelog b/debian/changelog
index b4626f741e..abcfedf6d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.98.0) stable; urgency=medium
+
+  * New Synapse release 1.98.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 12 Dec 2023 15:04:31 +0000
+
 matrix-synapse-py3 (1.98.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.98.0rc1.
diff --git a/docs/website_files/theme/index.hbs b/docs/website_files/theme/index.hbs
index f60a7e96aa..9cf7521e80 100644
--- a/docs/website_files/theme/index.hbs
+++ b/docs/website_files/theme/index.hbs
@@ -321,4 +321,4 @@
         {{/if}}
 
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/website_files/version.js b/docs/website_files/version.js
index 9065afcdbf..73f7e67f6a 100644
--- a/docs/website_files/version.js
+++ b/docs/website_files/version.js
@@ -1 +1 @@
-window.SYNAPSE_VERSION = "latest";
\ No newline at end of file
+window.SYNAPSE_VERSION = "latest";
diff --git a/pyproject.toml b/pyproject.toml
index db8b254161..b596cdf862 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.98.0rc1"
+version = "1.98.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"