summary refs log tree commit diff
path: root/synapse/handlers/presence.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-09-07 13:44:54 +0100
committerRichard van der Hoff <richard@matrix.org>2020-09-07 13:44:54 +0100
commitd74e8f28753e0fca8ae6c9f47f248a2abf9d998a (patch)
treee3df12529ee5480daed23131d58fa8cbe77b70c9 /synapse/handlers/presence.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentAdd cross-signing sigs to the `keys` object (#8234) (diff)
downloadsynapse-d74e8f28753e0fca8ae6c9f47f248a2abf9d998a.tar.xz
Merge branch 'release-v1.20.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/presence.py')
-rw-r--r--synapse/handlers/presence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py

index 1846068150..91a3aec1cc 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py
@@ -1010,7 +1010,7 @@ def format_user_presence_state(state, now, include_user_id=True): return content -class PresenceEventSource(object): +class PresenceEventSource: def __init__(self, hs): # We can't call get_presence_handler here because there's a cycle: #