summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-07 02:23:37 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-07 02:23:37 +0000
commit8c48971b510e441e2e90adb6ea84cb1e600a70c2 (patch)
treed10bf2a3da70948a17896bf43558840d27461930 /synapse/__init__.py
parentMerge branch 'release-v0.18.6' into develop (diff)
parentDiscard PDUs from invalid origins due to #1753 in 0.18.[56] (diff)
downloadsynapse-8c48971b510e441e2e90adb6ea84cb1e600a70c2.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 92690a48ac..91e3a2c2e0 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"
+__version__ = "0.18.7-rc1"