summary refs log tree commit diff
path: root/synapse/app/synchrotron.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-05 16:40:06 +0000
committerGitHub <noreply@github.com>2019-12-05 16:40:06 +0000
commitaf5d0ebc7243c372c5fa238c421fbd6b9663ff29 (patch)
tree819cda313cb340ac08ce4a0a5dab8ed1d0b97948 /synapse/app/synchrotron.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentNewsfile (diff)
downloadsynapse-af5d0ebc7243c372c5fa238c421fbd6b9663ff29.tar.xz
Merge pull request #6482 from matrix-org/erikj/port_rest_v1
Port rest/v1 to async/await
Diffstat (limited to '')
-rw-r--r--synapse/app/synchrotron.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py

index b14da09f47..288ee64b42 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py
@@ -151,7 +151,7 @@ class SynchrotronPresence(object): def set_state(self, user, state, ignore_status_msg=False): # TODO Hows this supposed to work? - pass + return defer.succeed(None) get_states = __func__(PresenceHandler.get_states) get_state = __func__(PresenceHandler.get_state)