diff options
author | David Baker <dave@matrix.org> | 2014-12-18 15:06:11 +0000 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2014-12-18 15:06:11 +0000 |
commit | 0a6664493a6277d6b7b78b54e0b2a6da591ad158 (patch) | |
tree | a01e93cb31ca94d83dba6a9a381997b88f5b3a25 /VERSION | |
parent | Thank you, pyflakes (diff) | |
parent | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse (diff) | |
download | synapse-0a6664493a6277d6b7b78b54e0b2a6da591ad158.tar.xz |
Merge branch 'master' into pushers
Diffstat (limited to 'VERSION')
-rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION index dc74c5626d..64c6e2f460 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.3a +0.5.4a |