diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-31 17:48:05 +0000 |
| commit | b63691f6e205b4e2d2a990ff04318e4daf731e2c (patch) | |
| tree | aa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /synapse/crypto/keyclient.py | |
| parent | Coturn's timestamps are in seconds, not milliseconds (diff) | |
| parent | Bump version numbers and change log (diff) | |
| download | synapse-b63691f6e205b4e2d2a990ff04318e4daf731e2c.tar.xz | |
Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2
Diffstat (limited to 'synapse/crypto/keyclient.py')
| -rw-r--r-- | synapse/crypto/keyclient.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py index 5949ea0573..5191be4570 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 @@ -99,4 +98,3 @@ class SynapseKeyClientProtocol(HTTPClient): class SynapseKeyClientFactory(Factory): protocol = SynapseKeyClientProtocol - |