1.20.0rc5
6 files changed, 23 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md
index aade896bd5..de869001b3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,25 @@
+Synapse 1.20.0rc5 (2020-09-18)
+==============================
+
+Features
+--------
+
+- Add flags to the `/versions` endpoint that includes whether new rooms default to using E2EE. ([\#8343](https://github.com/matrix-org/synapse/issues/8343))
+
+
+Bugfixes
+--------
+
+- Fix ratelimitng of federation `/send` requests. ([\#8342](https://github.com/matrix-org/synapse/issues/8342))
+- Fix a longstanding bug where back pagination over federation could get stuck if it failed to handle a received event. ([\#8349](https://github.com/matrix-org/synapse/issues/8349))
+
+
+Internal Changes
+----------------
+
+- Blacklist [MSC2753](https://github.com/matrix-org/matrix-doc/pull/2753) SyTests until it is implemented. ([\#8285](https://github.com/matrix-org/synapse/issues/8285))
+
+
Synapse 1.19.3 (2020-09-18)
===========================
diff --git a/changelog.d/8285.misc b/changelog.d/8285.misc
deleted file mode 100644
index 4646664ba1..0000000000
--- a/changelog.d/8285.misc
+++ /dev/null
@@ -1 +0,0 @@
-Blacklist [MSC2753](https://github.com/matrix-org/matrix-doc/pull/2753) SyTests until it is implemented.
\ No newline at end of file
diff --git a/changelog.d/8342.bugfix b/changelog.d/8342.bugfix
deleted file mode 100644
index 786057facb..0000000000
--- a/changelog.d/8342.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix ratelimitng of federation `/send` requests.
diff --git a/changelog.d/8343.feature b/changelog.d/8343.feature
deleted file mode 100644
index ccecb22f37..0000000000
--- a/changelog.d/8343.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add flags to the `/versions` endpoint that includes whether new rooms default to using E2EE.
diff --git a/changelog.d/8349.bugfix b/changelog.d/8349.bugfix
deleted file mode 100644
index cf2f531b14..0000000000
--- a/changelog.d/8349.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a longstanding bug where back pagination over federation could get stuck if it failed to handle a received event.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6b11c5681b..a95753dcc7 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
except ImportError:
pass
-__version__ = "1.20.0rc4"
+__version__ = "1.20.0rc5"
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
|
