Merge branch 'master' into develop

matrix-org · Aug 27, 2020 · 9cfc120 · 9cfc120
2 parents cf2f6c3 + eadfda3
commit 9cfc120
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,12 @@ from Synapse as most users have updated their client. Further context can be
 found at [\#6766](https://github.com/matrix-org/synapse/issues/6766).
 
 
+Synapse 1.19.1 (2020-08-27)
+===========================
+
+No significant changes.
+
+
 Synapse 1.19.1rc1 (2020-08-25)
 ==============================
 

diff --git a/debian/changelog b/debian/changelog
@@ -4,6 +4,12 @@ matrix-synapse-py3 (1.19.0ubuntu1) UNRELEASED; urgency=medium
 
  -- Dexter Chua <dec41@srcf.net>  Wed, 26 Aug 2020 12:41:36 +0000
 
+matrix-synapse-py3 (1.19.1) stable; urgency=medium
+
+  * New synapse release 1.19.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 27 Aug 2020 10:50:19 +0100
+
 matrix-synapse-py3 (1.19.0) stable; urgency=medium
 
   [ Synapse Packaging team ]

diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -48,7 +48,7 @@
 except ImportError:
     pass
 
-__version__ = "1.19.1rc1"
+__version__ = "1.19.1"
 
 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