Merge commit '7141057e8' into anoa/dinsic_release_1_21_x
* commit '7141057e8':
1.20.0rc4
Clarify changelog.
3 files changed, 14 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 4596cd2f2a..b44248e264 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.20.0rc4 (2020-09-16)
+==============================
+
+Synapse 1.20.0rc4 is identical to 1.20.0rc3, with the addition of the security fix that was included in 1.19.2.
+
+
Synapse 1.19.2 (2020-09-16)
===========================
@@ -15,7 +21,7 @@ Synapse 1.20.0rc3 (2020-09-11)
Bugfixes
--------
-- Fix a bug introduced in v1.20.0rc1 that the wrong exception was raised when invalid JSON data is encountered. ([\#8291](https://github.com/matrix-org/synapse/issues/8291))
+- Fix a bug introduced in v1.20.0rc1 where the wrong exception was raised when invalid JSON data is encountered. ([\#8291](https://github.com/matrix-org/synapse/issues/8291))
Synapse 1.20.0rc2 (2020-09-09)
diff --git a/debian/changelog b/debian/changelog
index 6d60db6084..bb7c175ada 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.20.0ubuntu1) UNRELEASED; urgency=medium
+
+ * Use Type=notify in systemd service
+
+ -- Dexter Chua <dec41@srcf.net> Wed, 26 Aug 2020 12:41:36 +0000
+
matrix-synapse-py3 (1.19.2) stable; urgency=medium
* New synapse release 1.19.2.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 078914695a..6b11c5681b 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
except ImportError:
pass
-__version__ = "1.19.2"
+__version__ = "1.20.0rc4"
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
|
