From 04aa2f286320852bd7a23ce874afe538d17a97bb Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 30 Sep 2016 10:34:53 +0100
Subject: [PATCH] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 69640801d..4ff3344c3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,24 @@
+Changes in synapse v0.18.1-rc1 (2016-09-30)
+===========================================
+
+Features:
+
+* Add total_room_count_estimate to ``/publicRooms`` (PR #1133)
+
+
+Changes:
+
+* Time out typing over federation (PR #1140)
+* Restructure LDAP authentication (PR #1153)
+
+
+Bug fixes:
+
+* Fix 3pid invites when server is already in the room (PR #1136)
+* Fix upgrading from very old database versions (PR #1145)
+* Fix port script to work with recently added tables (PR #1146)
+
+
 Changes in synapse v0.18.0 (2016-09-19)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 41745170a..0f706d265 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.18.0"
+__version__ = "0.18.1-rc1"