Merge branch 'master' into develop

Conflicts:
	setup.py
This commit is contained in:
Mark Haines 2015-09-07 15:06:46 +01:00
commit 73e4ad4b8b
7 changed files with 25 additions and 10 deletions

View file

@ -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,