diff options
| author | Steven Hammerton <steven.hammerton@openmarket.com> | 2015-11-05 20:59:45 +0000 |
|---|---|---|
| committer | Steven Hammerton <steven.hammerton@openmarket.com> | 2015-11-05 20:59:45 +0000 |
| commit | fece2f5c771ca4baab8a0541ede8af2e33ff1b41 (patch) | |
| tree | 22973a8a9a9b806cb09d734e19cb5150686e9869 /synapse/handlers/private_user_data.py | |
| parent | Allow hs to do CAS login completely and issue the client with a login token t... (diff) | |
| parent | Merge pull request #350 from matrix-org/erikj/search (diff) | |
| download | synapse-fece2f5c771ca4baab8a0541ede8af2e33ff1b41.tar.xz | |
Merge branch 'develop' into sh-cas-auth-via-homeserver
Diffstat (limited to 'synapse/handlers/private_user_data.py')
| -rw-r--r-- | synapse/handlers/private_user_data.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/private_user_data.py b/synapse/handlers/private_user_data.py index 1778c71325..1abe45ed7b 100644 --- a/synapse/handlers/private_user_data.py +++ b/synapse/handlers/private_user_data.py @@ -24,7 +24,7 @@ class PrivateUserDataEventSource(object): return self.store.get_max_private_user_data_stream_id() @defer.inlineCallbacks - def get_new_events_for_user(self, user, from_key, limit): + def get_new_events(self, user, from_key, **kwargs): user_id = user.to_string() last_stream_id = from_key |