Merge branch 'master' into develop

3 files changed, 13 insertions, 1 deletions

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

index 14a025e03e..bc1d1beb00 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.14.0 (2020-05-28)
+===========================
+
+No significant changes.
+
+
 Synapse 1.14.0rc2 (2020-05-27)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog

index e7842d4174..f50a102b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.14.0) stable; urgency=medium
+
+  * New synapse release 1.14.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 28 May 2020 10:37:27 +0000
+
 matrix-synapse-py3 (1.13.0) stable; urgency=medium
 
   [ Patrick Cloke ]
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 5e957985d7..f0105d3e2f 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.14.0rc2"
+__version__ = "1.14.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