Bump version and changelog v0.18.6

2 files changed, 8 insertions, 1 deletions

diff --git a/CHANGES.rst b/CHANGES.rst

index c1a8dd7613..28be0bb974 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 a1da92ef92..92690a48ac 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"