summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-03 18:03:42 +0000
committerErik Johnston <erik@matrix.org>2014-12-03 18:03:42 +0000
commit370cd9011ed1cf15af0b12a7cc1e9d1e110aaf0d (patch)
tree6cfacc683f68a9e9748058335c36e8ee2fa7f83d /VERSION
parentFix bug where did not always resolve all the deferreds in _attempt_new_transa... (diff)
parentBump changes and version (diff)
downloadsynapse-370cd9011ed1cf15af0b12a7cc1e9d1e110aaf0d.tar.xz
Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index b6f145ad19..7d8568351b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.3c
+0.5.4