From 3c099219e0506f81fc333ff9d27cc3af5c365a2c Mon Sep 17 00:00:00 2001
From: Neil Johnson <neil@fragile.org.uk>
Date: Wed, 16 May 2018 15:44:59 +0100
Subject: [PATCH] bump version and changelog for 0.29.0

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 78d015db9..b769b0f04 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,7 @@
+Changes in synapse v0.29.0 (2018-05-16)
+===========================================
+
+
 Changes in synapse v0.29.0-rc1 (2018-05-14)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 69c081eb3..d94c20505 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.29.0-rc1"
+__version__ = "0.29.0"