summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-21 14:10:31 +0000
committerErik Johnston <erik@matrix.org>2019-03-21 14:10:31 +0000
commitb0bf1ea7bda4894bae92a895c957a1a2ce431f4e (patch)
treec1ab07c55925e9c50aa0b7b55b4984bb9fc464e0 /synapse/handlers/_base.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms (diff)
downloadsynapse-b0bf1ea7bda4894bae92a895c957a1a2ce431f4e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r--synapse/handlers/_base.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py

index d8d86d6ff3..ac09d03ba9 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py
@@ -165,6 +165,7 @@ class BaseHandler(object): member_event.room_id, "leave", ratelimit=False, + require_consent=False, ) except Exception as e: logger.exception("Error kicking guest user: %s" % (e,))