summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-23 15:36:59 +0100
committerErik Johnston <erik@matrix.org>2016-09-23 15:36:59 +0100
commit4225a97f4e63ce82a21ea1e07c0a54324df261ec (patch)
tree006b8f4be1beba9aacbcd9ce379cb40ff6bd2f22 /synapse
parentMerge pull request #1136 from matrix-org/erikj/fix_signed_3pid (diff)
parentMerge branch 'release-v0.18.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-4225a97f4e63ce82a21ea1e07c0a54324df261ec.tar.xz
Merge branch 'master' 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 b778cd65c9..41745170a1 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.17.3"
+__version__ = "0.18.0"