From 2b8ff4659fa2ecdfdaf9f455a5f08d42ef6aa1e9 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 19 Sep 2016 17:16:56 +0100
Subject: [PATCH] Bump version and changelog

---
 CHANGES.rst         | 17 +++++++++++++++--
 synapse/__init__.py |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 50f123b37..4dcaf1170 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,5 @@
-Changes in synapse v0.18.0-rc1 (2016-09-16)
-===========================================
+Changes in synapse v0.18.0 (2016-09-19)
+=======================================
 
 The release includes major changes to the state storage database schemas, which
 significantly reduce database size. Synapse will attempt to upgrade the current
@@ -9,6 +9,19 @@ want to consider migrating to using Postgres before upgrading very large SQLite
 daabases
 
 
+Changes:
+
+* Make public room search case insensitive (PR #1127)
+
+
+Bug fixes:
+
+* Fix and clean up publicRooms pagination (PR #1129)
+
+
+Changes in synapse v0.18.0-rc1 (2016-09-16)
+===========================================
+
 Features:
 
 * Add ``only=highlight`` on ``/notifications`` (PR #1081)
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 25f65f9bc..41745170a 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-rc1"
+__version__ = "0.18.0"