diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-27 11:14:11 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-27 11:14:11 +0000 |
| commit | acb2d171e88f7e5a60f6468e5b4f39fdb1ce94a3 (patch) | |
| tree | 98b171bd5303e03ee123708f6ed96932f29db558 /synapse/crypto/keyclient.py | |
| parent | Add script to hash exisitng history (diff) | |
| parent | Test pyflakes jenikns integration (diff) | |
| download | synapse-acb2d171e88f7e5a60f6468e5b4f39fdb1ce94a3.tar.xz | |
Merge branch 'develop' into event_signing
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 |