diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-30 11:13:58 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-30 11:13:58 +0000 |
| commit | 7c063995123297dfd569f68e0f195cad7fa327c5 (patch) | |
| tree | 2ce0eb2215707808c689ac9ea9787fff8a9c7664 /synapse/crypto/keyclient.py | |
| parent | Pep8 and a few doc strings (diff) | |
| parent | Fix pep8 warnings (diff) | |
| download | synapse-7c063995123297dfd569f68e0f195cad7fa327c5.tar.xz | |
Merge branch 'develop' into request_logging
Conflicts: synapse/config/logger.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 33fa9ca837..bb1f400b54 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py @@ -100,4 +100,3 @@ class SynapseKeyClientProtocol(HTTPClient): class SynapseKeyClientFactory(Factory): protocol = SynapseKeyClientProtocol - |