summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-09-14 19:56:11 +0100
committerGitHub <noreply@github.com>2018-09-14 19:56:11 +0100
commitc30cfff5723a123d9abd5c86300d278882dcb385 (patch)
tree47f652b55ca626f0027bb827bc99faf38f7188e7 /res
parentdon't filter membership events based on history visibility (#3874) (diff)
parentNewsfile (diff)
downloadsynapse-c30cfff5723a123d9abd5c86300d278882dcb385.tar.xz
Merge pull request #3875 from matrix-org/erikj/extra_timeouts
Add an awful secondary timeout to fix wedged requests
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions