From b42a972b719c2f224fc8b83ced7625ff48ca5879 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 6 Jan 2017 14:44:28 +0000
Subject: [PATCH] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index c1a8dd761..28be0bb97 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse v0.18.6 (2017-01-06)
+=======================================
+
+Bug fixes:
+
+* Fix bug when checking if a guest user is allowed to join a room (PR #1772)
+
 Changes in synapse v0.18.6-rc3 (2017-01-05)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index a1da92ef9..92690a48a 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.6-rc3"
+__version__ = "0.18.6"