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 | |
| 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
| -rw-r--r-- | VERSION | 2 | ||||
| -rwxr-xr-x | setup.py | 4 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/VERSION b/VERSION index 3b3e723172..492b488cd8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1b +0.6.1c diff --git a/setup.py b/setup.py index 043cd044a7..f0e9e7d264 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ setup( description="Reference Synapse Home Server", install_requires=[ "syutil==0.0.2", - "matrix_angular_sdk==0.6.0", + "matrix_angular_sdk>=0.6.1", "Twisted>=14.0.0", "service_identity>=1.0.0", "pyopenssl>=0.14", @@ -47,7 +47,7 @@ setup( dependency_links=[ "https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2", "https://github.com/pyca/pynacl/tarball/d4d3175589b892f6ea7c22f466e0e223853516fa#egg=pynacl-0.3.0", - "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.0/#egg=matrix_angular_sdk-0.6.0", + "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.1/#egg=matrix_angular_sdk-0.6.1", ], setup_requires=[ "setuptools_trial", 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" |