summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-06-14 16:36:01 +0100
committerRichard van der Hoff <richard@matrix.org>2018-06-14 16:36:01 +0100
commit9a793f861c252e09ec5e15986a2ad01d3586d8ce (patch)
treefa57f00eea83a3ac2e2d48d1f0b6aaf5994e1839 /synapse/api
parentadd a last seen metric (#3396) (diff)
parentMerge tag 'v0.31.2' (diff)
downloadsynapse-9a793f861c252e09ec5e15986a2ad01d3586d8ce.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 06fa38366d..66639b0089 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py
@@ -655,7 +655,7 @@ class Auth(object): auth_events[(EventTypes.PowerLevels, "")] = power_level_event send_level = event_auth.get_send_level( - EventTypes.Aliases, "", auth_events + EventTypes.Aliases, "", power_level_event, ) user_level = event_auth.get_user_power_level(user_id, auth_events)