diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-27 14:32:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-27 14:32:54 +0100 |
commit | 955823672842b2102c4c6e204f81efbcd67200bc (patch) | |
tree | d70648dd1b7466452da27a4b7d8993c58481ed03 /synctl | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
parent | Merge remote-tracking branch 'origin/develop' into rav/deferred_timeout (diff) | |
download | synapse-955823672842b2102c4c6e204f81efbcd67200bc.tar.xz |
Merge pull request #3127 from matrix-org/rav/deferred_timeout
Use deferred.addTimeout instead of time_bound_deferred
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions