diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-19 16:37:08 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-19 16:37:08 +0000 |
commit | d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913 (patch) | |
tree | dff914dc74740d36be1da73be66a8b06c6c4feea /setup.py | |
parent | Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf (diff) | |
parent | Set a state_key for the topic and room name, otherwise they won't be treated ... (diff) | |
download | synapse-d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913.tar.xz |
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py index eb410aa6d3..043cd044a7 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.5.3b", + "matrix_angular_sdk==0.6.0", "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.5.3b/#egg=matrix_angular_sdk-0.5.3b", + "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.6.0/#egg=matrix_angular_sdk-0.6.0", ], setup_requires=[ "setuptools_trial", |