diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:12:29 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:12:29 -0400 |
| commit | faf72a4c403000f7815d171feb8bf1a83b353584 (patch) | |
| tree | d150b317ef4d0cf2245b664a37e51d76c0870352 /synapse/replication/http/membership.py | |
| parent | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys (diff) | |
| parent | Remove bind_email and bind_msisdn (#5964) (diff) | |
| download | synapse-faf72a4c403000f7815d171feb8bf1a83b353584.tar.xz | |
Merge branch 'develop' into cross-signing_keys
Diffstat (limited to 'synapse/replication/http/membership.py')
| -rw-r--r-- | synapse/replication/http/membership.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/replication/http/membership.py b/synapse/replication/http/membership.py index 4217335d88..b9ce3477ad 100644 --- a/synapse/replication/http/membership.py +++ b/synapse/replication/http/membership.py @@ -83,7 +83,7 @@ class ReplicationRemoteJoinRestServlet(ReplicationEndpoint): remote_room_hosts, room_id, user_id, event_content ) - return (200, {}) + return 200, {} class ReplicationRemoteRejectInviteRestServlet(ReplicationEndpoint): @@ -153,7 +153,7 @@ class ReplicationRemoteRejectInviteRestServlet(ReplicationEndpoint): yield self.store.locally_reject_invite(user_id, room_id) ret = {} - return (200, ret) + return 200, ret class ReplicationUserJoinedLeftRoomRestServlet(ReplicationEndpoint): @@ -202,7 +202,7 @@ class ReplicationUserJoinedLeftRoomRestServlet(ReplicationEndpoint): else: raise Exception("Unrecognized change: %r", change) - return (200, {}) + return 200, {} def register_servlets(hs, http_server): |