Skip to content
Snippets Groups Projects
Commit 06750140 authored by Erik Johnston's avatar Erik Johnston
Browse files

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

parents 8b7ce294 adbd720f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
synapse/http/matrixfederationclient.py
+ 0
− 1
View file @ 06750140
...@@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object): ...@@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object):
producer producer
) )
return self.clock.time_bound_deferred( return self.clock.time_bound_deferred(
request_deferred, request_deferred,
time_out=timeout/1000. if timeout else 60, time_out=timeout/1000. if timeout else 60,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment