Merge commit '536f4a248' into anoa/dinsic_release_1_21_x

* commit '536f4a248':
  1.20.0rc2

3 files changed, 10 insertions, 2 deletions

diff --git a/CHANGES.md b/CHANGES.md

index 81f9a1aa26..dbef6ab6c7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.20.0rc2 (2020-09-09)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.20.0rc1 causing some features related to notifications to misbehave following the implementation of unread counts. ([\#8280](https://github.com/matrix-org/synapse/issues/8280))
+
+
 Synapse 1.20.0rc1 (2020-09-08)
 ==============================
 
diff --git a/changelog.d/8280.bugfix b/changelog.d/8280.bugfix
deleted file mode 100644

index e306282438..0000000000
--- a/changelog.d/8280.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.20.0rc1 causing some features related to notifications to misbehave following the implementation of unread counts.
diff --git a/synapse/__init__.py b/synapse/__init__.py

index f4aca64be8..7e8731f86a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.20.0rc1"
+__version__ = "1.20.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