diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-27 11:58:32 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-27 11:58:32 +0000 |
| commit | ad9226eeec87f1e5e3886c4dd599f89e7577d5a5 (patch) | |
| tree | 602250011e5528be426aa8965164e707ea978cbc /synapse/crypto/keyclient.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into federation_autho... (diff) | |
| parent | fix pyflakes warnings (diff) | |
| download | synapse-ad9226eeec87f1e5e3886c4dd599f89e7577d5a5.tar.xz | |
Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'synapse/crypto/keyclient.py')
| -rw-r--r-- | synapse/crypto/keyclient.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py index 5949ea0573..7cfec5148e 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py @@ -17,7 +17,6 @@ from twisted.web.http import HTTPClient from twisted.internet.protocol import Factory from twisted.internet import defer, reactor -from twisted.internet.endpoints import connectProtocol from synapse.http.endpoint import matrix_endpoint import json import logging |