diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-12-16 17:29:49 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-12-16 17:29:49 +0000 |
commit | 56db465047c2906a78eccdd63b2fa18d72903a66 (patch) | |
tree | bdd082c04fd0c02b4d732bf8ea6e4dd559d84b51 /VERSION | |
parent | SYN-142: Use a default log file 'homeserver.log' so people get logging by def... (diff) | |
parent | Change upgrade script to not check hashes or signatures (diff) | |
download | synapse-56db465047c2906a78eccdd63b2fa18d72903a66.tar.xz |
Merge branch 'release-v0.6.0' 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 64c6e2f460..a918a2aa18 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.4a +0.6.0 |