summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2017-01-06 14:46:27 +0000
committerMark Haines <mark.haines@matrix.org>2017-01-06 14:46:27 +0000
commit06c00bd19b0b98c828b820e070f7b79c7eef61ad (patch)
treecc66e6cced36e99bee2229c914b97cdd350d56dc /synapse/__init__.py
parentMerge branch 'release-v0.18.6' into develop (diff)
parentBump version and changelog (diff)
downloadsynapse-06c00bd19b0b98c828b820e070f7b79c7eef61ad.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 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"