diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-07 14:55:06 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-07 14:55:06 +0000 |
commit | cc7a267a85eb3341cef5313010ac195e166f2c0f (patch) | |
tree | 27510a6358b8bc219ccd456622b963a3b394bee3 /VERSION | |
parent | Remove unused import (diff) | |
parent | Improve change log (diff) | |
download | synapse-cc7a267a85eb3341cef5313010ac195e166f2c0f.tar.xz |
Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'VERSION')
-rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION index a918a2aa18..ee6cdce3c2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.0 +0.6.1 |