Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:56:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into request_logging

Browse source 
Conflicts:
	synapse/config/logger.py
This commit is contained in:
Mark Haines 2014-10-30 11:13:58 +00:00
commit 7c06399512
46 changed files with 391 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

1
synapse/crypto/keyclient.py
View file

@ -100,4 +100,3 @@ class SynapseKeyClientProtocol(HTTPClient):
class SynapseKeyClientFactory(Factory):
protocol = SynapseKeyClientProtocol