Merge branch 'master' into develop

3 files changed, 13 insertions, 1 deletions

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

index 54a642e11a..3a522f8518 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.22.0 (2020-10-27)
+===========================
+
+No significant changes.
+
+
 Synapse 1.22.0rc2 (2020-10-26)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog

index 8d873a4845..40f02443f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.22.0) stable; urgency=medium
+
+  * New synapse release 1.22.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 27 Oct 2020 12:07:12 +0000
+
 matrix-synapse-py3 (1.21.2) stable; urgency=medium
 
   [ Synapse Packaging team ]
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 24a5815447..35a82c0bfe 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.22.0rc2"
+__version__ = "1.22.0"
 
 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