summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-02 13:09:48 +0000
committerErik Johnston <erik@matrix.org>2015-02-02 13:09:48 +0000
commitbcb8d2fe548e85559246dd15a659839f6713cbd1 (patch)
tree71754c792a544d5e18e58c52fac32109b27cd589 /VERSION
parentAdd matrix.org as a trusted ID server because it's now passed through on port... (diff)
parentUse >= for version of webclient (diff)
downloadsynapse-bcb8d2fe548e85559246dd15a659839f6713cbd1.tar.xz
Merge branch 'hotfixes-v0.6.1c' of github.com:matrix-org/synapse v0.6.1c
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 3b3e723172..492b488cd8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.1b
+0.6.1c