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

2015-08-13 11:55:20 +01:00 · 2015-08-13 11:55:20 +01:00 · 06750140f6
parent 8b7ce2945b adbd720fab
commit 06750140f6
1 changed files with 0 additions and 1 deletions
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object):
                            producer
                        )

-
                        return self.clock.time_bound_deferred(
                            request_deferred,
                            time_out=timeout/1000. if timeout else 60,