diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-13 18:16:12 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-13 18:16:12 +0000 |
commit | 3983c7fb0ffa5c95c3b143aecd32510c156f9950 (patch) | |
tree | 08ad33e77f0c0f56a8acb4c2ed00966c553c1909 /VERSION | |
parent | Fix typo in media repository doc string (diff) | |
parent | Bump version and change log (diff) | |
download | synapse-3983c7fb0ffa5c95c3b143aecd32510c156f9950.tar.xz |
Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'VERSION')
-rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION index 7d8568351b..64c6e2f460 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.4 +0.5.4a |