summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-08 09:43:01 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-08 09:43:01 +0000
commitf3467d4646e05c0d5d057e0652ad12ce6d63bc77 (patch)
tree73e2f3622fb5c6e8613085f12bb867525394b0e4 /VERSION
parentMerge branch 'release-v0.6.1' of github.com:matrix-org/synapse (diff)
parentBump version (diff)
downloadsynapse-f3467d4646e05c0d5d057e0652ad12ce6d63bc77.tar.xz
Merge branch 'hotfixes-v0.6.1' v0.6.1a
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index ee6cdce3c2..8b9dea59dc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.1
+0.6.1a