summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-04 15:58:24 +0000
committerErik Johnston <erik@matrix.org>2014-12-04 15:58:24 +0000
commitc5c32266d8f47d1b09d8120ba627529f03e94622 (patch)
treee43dba2a184ae95ddaa9ac23126a3fdfa738daca /VERSION
parentConvert rest and handlers to use new event structure (diff)
parent@log_function on PresenceStream's get_new_events_for_user() (diff)
downloadsynapse-c5c32266d8f47d1b09d8120ba627529f03e94622.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
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