diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:06:46 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:06:46 +0100 |
commit | 73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e (patch) | |
tree | 268463223a4dbed35244b83ffb7b767330f8416e /setup.py | |
parent | update logger to match new ambiguous script name... (diff) | |
parent | DEPENDENCY_LINKS was turned to a list (diff) | |
download | synapse-73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e.tar.xz |
Merge branch 'master' into develop
Conflicts: setup.py
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py index 0e3f2f18d5..9d24761d44 100755 --- a/setup.py +++ b/setup.py @@ -81,7 +81,7 @@ setup( packages=find_packages(exclude=["tests", "tests.*"]), description="Reference Synapse Home Server", install_requires=dependencies['requirements'](include_conditional=True).keys(), - dependency_links=dependencies["DEPENDENCY_LINKS"], + dependency_links=dependencies["DEPENDENCY_LINKS"].values(), include_package_data=True, zip_safe=False, long_description=long_description, |