Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix a bad merge of release-v1.20.0 to develop #8354

Merged
merged 1 commit into from
Sep 18, 2020
Merged

Fix a bad merge of release-v1.20.0 to develop #8354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8354.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bad merge from `release-v1.20.0` branch to `develop`.
2 changes: 1 addition & 1 deletion synapse/handlers/pagination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ async def get_messages(
)

await self.hs.get_handlers().federation_handler.maybe_backfill(
room_id, curr_topo, limit=source_config.limit,
room_id, curr_topo, limit=pagin_config.limit,
)

to_room_key = None
Expand Down