summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-08 14:40:54 +0000
committerErik Johnston <erik@matrix.org>2016-11-08 14:40:54 +0000
commit291628d42a8dbd6cbf49154d6a5b35582c0e5cde (patch)
tree0fddc5139ddd2509422cba07e544a4998f19c8e7 /synapse/__init__.py
parentMerge branch 'release-v0.18.2' of github.com:matrix-org/synapse (diff)
parentBump version and changelog (diff)
downloadsynapse-291628d42a8dbd6cbf49154d6a5b35582c0e5cde.tar.xz
Merge branch 'erikj/ldap3_auth' v0.18.3
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 4e2a592d3d..d366b69dab 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.2"
+__version__ = "0.18.3"