summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-18 09:41:53 +0100
committerErik Johnston <erik@matrix.org>2016-10-18 09:41:53 +0100
commit50ac1d843db633d325c5ea39dec3583bf8a6ed0a (patch)
tree825e8f35f31d83e0bee4157192ba4077575b801d /synapse
parentMerge pull request #1113 from matrix-org/erikj/remove_auth (diff)
parentUpdate changelog (diff)
downloadsynapse-50ac1d843db633d325c5ea39dec3583bf8a6ed0a.tar.xz
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6dbe8fc7e7..6333c1119e 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.1"
+__version__ = "0.18.2-rc1"