summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-13 10:01:22 +0000
committerErik Johnston <erik@matrix.org>2015-01-13 10:01:22 +0000
commit38e3241eb78d365e8264120574bc5970cfd5a326 (patch)
treef28cd87265be9df0d7bdc0b16b2645b8f9cd5657 /VERSION
parentUse float rather than integer divisions to turn msec into sec - so timeouts u... (diff)
parentBump version (diff)
downloadsynapse-38e3241eb78d365e8264120574bc5970cfd5a326.tar.xz
Merge branch 'hotfixes-v0.6.1b' 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 8b9dea59dc..3b3e723172 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.1a
+0.6.1b