diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-02 13:09:48 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-02 13:09:48 +0000 |
commit | bcb8d2fe548e85559246dd15a659839f6713cbd1 (patch) | |
tree | 71754c792a544d5e18e58c52fac32109b27cd589 /VERSION | |
parent | Add matrix.org as a trusted ID server because it's now passed through on port... (diff) | |
parent | Use >= for version of webclient (diff) | |
download | synapse-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-- | VERSION | 2 |
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 |