Merge branch 'master' into develop

2020-05-28 12:50:26 +02:00 · 2020-05-28 12:50:26 +02:00 · 5cb470b495
parent 8c5f88fa4d 76261fc59d
commit 5cb470b495
3 changed files with 13 additions and 1 deletions
--- 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)
 ==============================

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