tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix a bad merge from release-v1.20.0. (#8354)

Browse source
This commit is contained in:
Patrick Cloke 2020-09-18 12:54:04 -04:00 committed by GitHub
parent 00db7786de
commit babc027543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8354.misc Normal file
View file

@ -0,0 +1 @@
Fix bad merge from `release-v1.20.0` branch to `develop`.

2
synapse/handlers/pagination.py
View file

@ -385,7 +385,7 @@ class PaginationHandler:
) )
await self.hs.get_handlers().federation_handler.maybe_backfill( 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 to_room_key = None