summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-05 17:06:55 +0100
committerErik Johnston <erik@matrix.org>2016-10-05 17:06:55 +0100
commit503c0ab78b745e4b8789d2989b9ab9c336eff2b7 (patch)
tree670e728c9dea2662c04ccd5bfa0b7288065cad36 /synapse
parentMerge pull request #1156 from matrix-org/dbkr/email_notifs_add_riot_brand (diff)
parentMerge branch 'release-v0.18.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-503c0ab78b745e4b8789d2989b9ab9c336eff2b7.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 41745170a1..6dbe8fc7e7 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.0"
+__version__ = "0.18.1"