diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-05 15:43:52 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-05 15:43:52 +0000 |
commit | 729ea933ea4a02430002d5055483c3ea34538578 (patch) | |
tree | 2064ec885655d444c4d155b1132f845176b36ec4 /synapse/handlers/private_user_data.py | |
parent | Implement basic pagination for search results (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-729ea933ea4a02430002d5055483c3ea34538578.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
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 |