diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
| commit | b16cd18a86a530d955d38bbdbc03daa0d70a2f9b (patch) | |
| tree | 8a2e6eb451ec5121affe2afc13ce95ab6fcc4bfd /setup.py | |
| parent | Doc-string for config ultility function (diff) | |
| parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
| download | synapse-b16cd18a86a530d955d38bbdbc03daa0d70a2f9b.tar.xz | |
Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails
Diffstat (limited to '')
| -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" ], |