diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-02-02 17:18:54 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-02-02 17:18:54 +0000 |
| commit | de11b5b9b5da286d2cb96f8ae5c18f6b55b9b460 (patch) | |
| tree | 009a6132dd0c507fb68a449efc247519d2a8aab7 /synapse/server.py | |
| parent | Merge pull request #549 from matrix-org/erikj/sync (diff) | |
| parent | Fix flake8 warnings for new flake8 (diff) | |
| download | synapse-de11b5b9b5da286d2cb96f8ae5c18f6b55b9b460.tar.xz | |
Merge pull request #551 from matrix-org/daniel/flake8
Fix flake8 warnings for new flake8
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py index 5fee7fe130..368d615576 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -23,7 +23,7 @@ from twisted.web.client import BrowserLikePolicyForHTTPS from twisted.enterprise import adbapi from synapse.federation import initialize_http_replication -from synapse.http.client import SimpleHttpClient, InsecureInterceptableContextFactory +from synapse.http.client import SimpleHttpClient, InsecureInterceptableContextFactory from synapse.notifier import Notifier from synapse.api.auth import Auth from synapse.handlers import Handlers |