Merge branch 'master' into develop

2020-10-27 12:12:54 +00:00 · 2020-10-27 12:12:54 +00:00 · 24229fac05
parent 2e380f0f18 fedfdfd750
commit 24229fac05
3 changed files with 13 additions and 1 deletions
--- 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)
 ==============================

--- 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 ]
--- 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