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:43:49 +0000
committerErik Johnston <erik@matrix.org>2016-11-08 14:43:49 +0000
commite6651e804693edd575370157ab3fef08d6952186 (patch)
tree5eec467445186c011b2c1a6f083d9d852f51f869 /synapse/__init__.py
parentMerge pull request #1615 from matrix-org/erikj/limit_prev_events (diff)
parentMerge branch 'erikj/ldap3_auth' (diff)
downloadsynapse-e6651e804693edd575370157ab3fef08d6952186.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse 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 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"