summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-03 18:03:42 +0000
committerErik Johnston <erik@matrix.org>2014-12-03 18:03:42 +0000
commit370cd9011ed1cf15af0b12a7cc1e9d1e110aaf0d (patch)
tree6cfacc683f68a9e9748058335c36e8ee2fa7f83d /synapse
parentFix bug where did not always resolve all the deferreds in _attempt_new_transa... (diff)
parentBump changes and version (diff)
downloadsynapse-370cd9011ed1cf15af0b12a7cc1e9d1e110aaf0d.tar.xz
Merge branch 'release-v0.5.4' 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 0b43932305..723e15d506 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.5.3c"
+__version__ = "0.5.4"