diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-02-19 12:00:16 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-02-19 12:00:16 +0000 |
| commit | 05aee12652e687adf8926314a69362b5a7183d5e (patch) | |
| tree | 0cf5695e5042ab107065489b07a695c707b837f8 /synapse/push/httppusher.py | |
| parent | Allow guest users access to messages in rooms they have joined (diff) | |
| parent | Add presence metric (diff) | |
| download | synapse-05aee12652e687adf8926314a69362b5a7183d5e.tar.xz | |
Merge branch 'develop' into rav/guest_access_after_room_join
Diffstat (limited to 'synapse/push/httppusher.py')
| -rw-r--r-- | synapse/push/httppusher.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index cdc4494928..9be4869360 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -23,12 +23,11 @@ logger = logging.getLogger(__name__) class HttpPusher(Pusher): - def __init__(self, _hs, profile_tag, user_id, app_id, + def __init__(self, _hs, user_id, app_id, app_display_name, device_display_name, pushkey, pushkey_ts, data, last_token, last_success, failing_since): super(HttpPusher, self).__init__( _hs, - profile_tag, user_id, app_id, app_display_name, |