From 3c91c5b2162d4697f4e12c06ec779765293ab682 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 1 Nov 2016 13:06:36 +0000
Subject: [PATCH] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 4f952eecc..371f26eb6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in synapse v0.18.2 (2016-11-01)
+=======================================
+
+No changes since v0.18.2-rc5
+
+
 Changes in synapse v0.18.2-rc5 (2016-10-28)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 7ae145956..4e2a592d3 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.2-rc5"
+__version__ = "0.18.2"