MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-04 10:18:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache

Browse source
This commit is contained in:
Erik Johnston 2015-08-13 11:55:20 +01:00
parent 8b7ce2945b adbd720fab
commit 06750140f6
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
synapse/http/matrixfederationclient.py
View file

@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object):
producer
)
return self.clock.time_bound_deferred(
request_deferred,
time_out=timeout/1000. if timeout else 60,