summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-23 11:31:53 +0000
committerErik Johnston <erik@matrix.org>2016-11-23 11:31:53 +0000
commitb69f76c1069ac4daa570102ab3dac0bf08e8dcc1 (patch)
treeb3b53d30e85bc26946c988ccc478f130b6f1c452 /synapse/__init__.py
parentComment (diff)
parentMerge pull request #1640 from matrix-org/kegan/sync-perf (diff)
downloadsynapse-b69f76c1069ac4daa570102ab3dac0bf08e8dcc1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_fed_txn
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 d366b69dab..432567a110 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.3"
+__version__ = "0.18.4"