diff options
author | Erik Johnston <erikj@jki.re> | 2018-07-03 10:18:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-03 10:18:39 +0100 |
commit | 957944eee4e89c19e7385635b71225da8c69fd0b (patch) | |
tree | ba88d0925aeb3bbcd50ed8da96211ee76513e502 | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Fix PEP8 (diff) | |
download | synapse-957944eee4e89c19e7385635b71225da8c69fd0b.tar.xz |
Merge pull request #3476 from matrix-org/erikj/timeout_memberships
Timeout membership requests after 90s
-rw-r--r-- | synapse/handlers/room_member.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py |