diff --git a/changelog.d/8354.misc b/changelog.d/8354.misc new file mode 100644 index 0000000000000000000000000000000000000000..1d33cde2da6cbcb7e0852c8c161409c6ebe98a15 --- /dev/null +++ b/changelog.d/8354.misc @@ -0,0 +1 @@ +Fix bad merge from `release-v1.20.0` branch to `develop`. diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index f132ed3368df95b86295669f9ccca0eb00c5b087..a0b3bdb5e0c39b186f23a8e77c50f351faa7ad89 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -385,7 +385,7 @@ class PaginationHandler: ) 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