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 /synapse | |
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 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index e7e27b06ec..fdfe5eda3e 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.6.1b" +__version__ = "0.6.1c" |