summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-13 18:16:12 +0000
committerErik Johnston <erik@matrix.org>2014-12-13 18:16:12 +0000
commit3983c7fb0ffa5c95c3b143aecd32510c156f9950 (patch)
tree08ad33e77f0c0f56a8acb4c2ed00966c553c1909 /synapse/__init__.py
parentFix typo in media repository doc string (diff)
parentBump version and change log (diff)
downloadsynapse-3983c7fb0ffa5c95c3b143aecd32510c156f9950.tar.xz
Merge branch 'hotfixes-v0.5.4' 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 723e15d506..7e49e1fd08 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.4"
+__version__ = "0.5.4a"