summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMatthew <matthew@matrix.org>2017-01-07 03:46:16 +0000
committerMatthew <matthew@matrix.org>2017-01-07 03:46:16 +0000
commit6d363cea9d201b1e3807a991b4f88bdf9793d604 (patch)
treec74dec00f1e708b3f22c7473b6f247a4863981d8 /synapse/__init__.py
parentMerge branch 'release-v0.18.7' into develop (diff)
parentbump changelog & version (diff)
downloadsynapse-6d363cea9d201b1e3807a991b4f88bdf9793d604.tar.xz
Merge branch 'release-v0.18.7' 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 91e3a2c2e0..cb332279df 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.7-rc1"
+__version__ = "0.18.7-rc2"