summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-02 13:09:48 +0000
committerErik Johnston <erik@matrix.org>2015-02-02 13:09:48 +0000
commitbcb8d2fe548e85559246dd15a659839f6713cbd1 (patch)
tree71754c792a544d5e18e58c52fac32109b27cd589 /setup.py
parentAdd matrix.org as a trusted ID server because it's now passed through on port... (diff)
parentUse >= for version of webclient (diff)
downloadsynapse-bcb8d2fe548e85559246dd15a659839f6713cbd1.tar.xz
Merge branch 'hotfixes-v0.6.1c' of github.com:matrix-org/synapse v0.6.1c
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py4
1 files changed, 2 insertions, 2 deletions
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",