From e7aaa7c61eed963abf41950ed6c0fd4407dce49c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 30 Mar 2016 12:35:25 +0100
Subject: [PATCH] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index a85c8d69f..8c180750a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse v0.14.0 (2016-03-30)
+=======================================
+
+No changes from v0.14.0-rc2
+
 Changes in synapse v0.14.0-rc2 (2016-03-23)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 60a7e8d69..7de51fbe8 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.14.0-rc2"
+__version__ = "0.14.0"