summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-12-29 17:33:46 +0000
committerMark Haines <mark.haines@matrix.org>2016-12-29 17:33:46 +0000
commit342fb8dae939dab20948971f0409065de5d8f25b (patch)
treec2d2b4af97e09c71844aea473f32846d25d384fa /synapse/__init__.py
parentFix another comment typo (diff)
parentBump changelog and version (diff)
downloadsynapse-342fb8dae939dab20948971f0409065de5d8f25b.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f006e10dc5..84592f53ea 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.5"
+__version__ = "0.18.6-rc1"