diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-03 09:54:08 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-03 09:54:08 +0100 |
| commit | efeeff29f66f14fd4744413a3fd211d01e6c302a (patch) | |
| tree | db5be4d096fdd045623017abffc7b67806c55c32 /setup.py | |
| parent | hacky support for video for FS CC DD (diff) | |
| parent | Change log level to info (diff) | |
| download | synapse-0.10.0.tar.xz | |
Merge branch 'release-v0.10.0' v0.10.0
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 f9929591e7..16ccc0f1b8 100755 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ setup( description="Reference Synapse Home Server", install_requires=dependencies['requirements'](include_conditional=True).keys(), setup_requires=[ - "Twisted==14.0.2", # Here to override setuptools_trial's dependency on Twisted>=2.4.0 + "Twisted>=15.1.0", # Here to override setuptools_trial's dependency on Twisted>=2.4.0 "setuptools_trial", "mock" ], |