diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-08-25 02:25:38 +0200 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-08-25 02:25:38 +0200 |
| commit | a98eae5835064639dd85055f489ff9d1d43d9769 (patch) | |
| tree | 79e3183675a5c34198c75989b824766c75936553 /synapse/handlers/search.py | |
| parent | changelog (diff) | |
| parent | Merge pull request #3758 from matrix-org/erikj/admin_contact (diff) | |
| download | synapse-a98eae5835064639dd85055f489ff9d1d43d9769.tar.xz | |
Merge branch 'develop' into matthew/fix_overzealous_ll_state
Diffstat (limited to 'synapse/handlers/search.py')
| -rw-r--r-- | synapse/handlers/search.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py index 69ae9731d5..c464adbd0b 100644 --- a/synapse/handlers/search.py +++ b/synapse/handlers/search.py @@ -287,7 +287,7 @@ class SearchHandler(BaseHandler): contexts = {} for event in allowed_events: res = yield self.store.get_events_around( - event.room_id, event.event_id, before_limit, after_limit + event.room_id, event.event_id, before_limit, after_limit, ) logger.info( |