diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:58:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:58:00 +0000 |
| commit | 396a67a09ad6217cab8010466d4f06ac897ad885 (patch) | |
| tree | cbe6996b8ad2b5560f17944625daedae8bf09285 /synapse/rest/client/v1/pusher.py | |
| parent | Use get_room_events_stream to get changes to the rooms if the number of chang... (diff) | |
| parent | Merge changes from develop (diff) | |
| download | synapse-396a67a09ad6217cab8010466d4f06ac897ad885.tar.xz | |
Merge branch 'client_v2_filter' into client_v2_sync
Conflicts: synapse/rest/client/v2_alpha/__init__.py
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py index 80a11890a3..72d5e9e476 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py @@ -27,7 +27,7 @@ class PusherRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_POST(self, request): - user = yield self.auth.get_user_by_req(request) + user, _ = yield self.auth.get_user_by_req(request) content = _parse_json(request) |