summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-09-14 16:58:44 +0100
committerGitHub <noreply@github.com>2018-09-14 16:58:44 +0100
commit3e6e94fe9f2f543de923f33ada5cb19f93428ded (patch)
treecab11a3071e6ff10dab205a7f0dd276d60ba5736 /contrib
parentMerge pull request #3871 from matrix-org/erikj/in_flight_block_metrics (diff)
parentfix (diff)
downloadsynapse-3e6e94fe9f2f543de923f33ada5cb19f93428ded.tar.xz
Merge pull request #3872 from matrix-org/hawkowl/timeouts-2
timeouts 2: electric boogaloo
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions