diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-09 14:53:30 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-09 14:53:30 +0000 |
| commit | d45c030652d879ef0b967bfe1dd85627ac22eb79 (patch) | |
| tree | 47cd5652d60fc765824bc75afa74b232bbcdaee1 | |
| parent | PEP8 (diff) | |
| parent | Ignore pycharm dir (diff) | |
| download | synapse-d45c030652d879ef0b967bfe1dd85627ac22eb79.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
| -rwxr-xr-x | setup.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setup.py b/setup.py index d1b8f0680a..1d71e154e2 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.1", + "matrix_angular_sdk==0.5.3b", "Twisted>=14.0.0", "service_identity>=1.0.0", "pyopenssl>=0.14", @@ -46,7 +46,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.1/#egg=matrix_angular_sdk-0.5.1", + "https://github.com/matrix-org/matrix-angular-sdk/tarball/v0.5.3b/#egg=matrix_angular_sdk-0.5.3b", ], setup_requires=[ "setuptools_trial", @@ -60,6 +60,6 @@ setup( entry_points=""" [console_scripts] synctl=synapse.app.synctl:main - synapse-homeserver=synapse.app.homeserver:run + synapse-homeserver=synapse.app.homeserver:main """ ) |