diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-15 14:45:59 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-15 14:45:59 +0000 |
commit | 57e0e619f3ddc68673a0d7b345203b1a52ff1fa1 (patch) | |
tree | d7c45715bc9313f7602243b1cd614d95d1a24858 /synapse/__init__.py | |
parent | Add beginnings of upgrade script (diff) | |
parent | Still send typing notifications to myself if I'm the only one in the room (it... (diff) | |
download | synapse-57e0e619f3ddc68673a0d7b345203b1a52ff1fa1.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: tests/handlers/test_room.py
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r-- | synapse/__init__.py | 2 |
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" |