diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
commit | dc3c2823ac425c9b5bbe6883b7d33a12059a08fb (patch) | |
tree | 22d02a68df93c3f98b0be7de8a07040268420369 /synapse/rest/presence.py | |
parent | Rename 'meta' to 'unsigned' (diff) | |
parent | keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ... (diff) | |
download | synapse-dc3c2823ac425c9b5bbe6883b7d33a12059a08fb.tar.xz |
Merge branch 'develop' into event_signing
Conflicts: synapse/federation/replication.py
Diffstat (limited to 'synapse/rest/presence.py')
-rw-r--r-- | synapse/rest/presence.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/presence.py b/synapse/rest/presence.py index 7fc8ce4404..138cc88a05 100644 --- a/synapse/rest/presence.py +++ b/synapse/rest/presence.py @@ -68,7 +68,7 @@ class PresenceStatusRestServlet(RestServlet): yield self.handlers.presence_handler.set_state( target_user=user, auth_user=auth_user, state=state) - defer.returnValue((200, "")) + defer.returnValue((200, {})) def on_OPTIONS(self, request): return (200, {}) @@ -141,7 +141,7 @@ class PresenceListRestServlet(RestServlet): yield defer.DeferredList(deferreds) - defer.returnValue((200, "")) + defer.returnValue((200, {})) def on_OPTIONS(self, request): return (200, {}) |