diff options
| author | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
| commit | c50ad14bae20d2a8448bb9fe78e919958dc9d233 (patch) | |
| tree | 3b6b3221cb11b16a105d1edf9e4ffe9519c3900a /setup.py | |
| parent | Allow sign in using email address (diff) | |
| parent | Merge pull request #211 from matrix-org/email_in_use (diff) | |
| download | synapse-c50ad14bae20d2a8448bb9fe78e919958dc9d233.tar.xz | |
Merge branch 'develop' into email_login
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" ], |