summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2014-12-18 15:06:11 +0000
committerDavid Baker <dave@matrix.org>2014-12-18 15:06:11 +0000
commit0a6664493a6277d6b7b78b54e0b2a6da591ad158 (patch)
treea01e93cb31ca94d83dba6a9a381997b88f5b3a25 /synapse/__init__.py
parentThank you, pyflakes (diff)
parentMerge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse (diff)
downloadsynapse-0a6664493a6277d6b7b78b54e0b2a6da591ad158.tar.xz
Merge branch 'master' into pushers
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 658574dab9..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.3a" +__version__ = "0.5.4a"