summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-08-27 11:01:21 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-08-27 11:01:21 +0100
commit9cfc1202337c050e216d587d45586479c3da58d0 (patch)
tree8d47991c8465fa1aaca1fc56ab177261f1a0462c
parentUpdate debian systemd service to use Type=notify (#8169) (diff)
parent1.19.1 (diff)
downloadsynapse-9cfc1202337c050e216d587d45586479c3da58d0.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 9264614f39..92e29983b9 100644
--- 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
index d20ca06b5b..bde3b636ee 100644
--- 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
index 2195723613..1282d19b3c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 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