diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
| commit | 6f52e90065243682d93e5f89b071e1fb056fa6ab (patch) | |
| tree | 98b9c43dd42dbc3d14a96f1b81e0631c7ac271c9 /synapse/http/matrixfederationclient.py | |
| parent | Unused import (diff) | |
| parent | Merge pull request #553 from matrix-org/daniel/accesstokenlogging (diff) | |
| download | synapse-6f52e90065243682d93e5f89b071e1fb056fa6ab.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index da13e32e78..c3589534f8 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -152,7 +152,7 @@ class MatrixFederationHttpClient(object): return self.clock.time_bound_deferred( request_deferred, - time_out=timeout/1000. if timeout else 60, + time_out=timeout / 1000. if timeout else 60, ) response = yield preserve_context_over_fn( |