summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-13 10:00:47 +0000
committerErik Johnston <erik@matrix.org>2015-01-13 10:00:47 +0000
commitb1a38c39add2fa6575ecb96072f3c5e556e96666 (patch)
tree5e676a57a9cdd797c5c26c20a071bd8623761bb2 /VERSION
parentMerge branch 'hotfixes-v0.6.1' (diff)
parentBump version (diff)
downloadsynapse-b1a38c39add2fa6575ecb96072f3c5e556e96666.tar.xz
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse v0.6.1b
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