summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md15
-rw-r--r--changelog.d/8875.misc1
-rw-r--r--changelog.d/8878.bugfix1
-rw-r--r--synapse/__init__.py2
4 files changed, 16 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index e7aaebb1f3..26d4138445 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,18 @@
+Synapse 1.24.0rc2 (2020-12-04)
+==============================
+
+Bugfixes
+--------
+
+- Fix a regression in v1.24.0rc1 which failed to allow SAML mapping providers which were unable to redirect users to an additional page. ([\#8878](https://github.com/matrix-org/synapse/issues/8878))
+
+
+Internal Changes
+----------------
+
+- Add support for the latest third-party libraries. Contributed by Jordan Bancino. ([\#8875](https://github.com/matrix-org/synapse/issues/8875))
+
+
 Synapse 1.24.0rc1 (2020-12-02)
 ==============================
 
diff --git a/changelog.d/8875.misc b/changelog.d/8875.misc
deleted file mode 100644
index 5a56a62968..0000000000
--- a/changelog.d/8875.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add support for the latest third-party libraries. Contributed by Jordan Bancino.
diff --git a/changelog.d/8878.bugfix b/changelog.d/8878.bugfix
deleted file mode 100644
index e53005ee1c..0000000000
--- a/changelog.d/8878.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a regression in v1.24.0rc1 which failed to allow SAML mapping providers which were unable to redirect users to an additional page.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d33a99f230..2e354f2cc6 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.24.0rc1"
+__version__ = "1.24.0rc2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when