From 61469308df5a0fc119d6e6464500af3eccb00f83 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Thu, 28 May 2020 12:36:00 +0200
Subject: [PATCH] 1.14.0

---
 CHANGES.md          | 6 ++++++
 synapse/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

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