summary refs log tree commit diff
path: root/synapse/handlers/pagination.py
diff options
context:
space:
mode:
authorSean Quah <seanq@matrix.org>2022-12-13 13:45:55 +0000
committerSean Quah <seanq@matrix.org>2022-12-13 13:45:55 +0000
commit9d40fc961b734ad9fedfce595d0da32cde7ba6ef (patch)
tree4e9c3bf1aefe963359bb266af0dfe5d3ff64759c /synapse/handlers/pagination.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentTidy up CHANGES.md (diff)
downloadsynapse-9d40fc961b734ad9fedfce595d0da32cde7ba6ef.tar.xz
Merge branch 'release-v1.74' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/pagination.py')
-rw-r--r--synapse/handlers/pagination.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py

index c572508a02..8c8ff18a1a 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py
@@ -27,9 +27,9 @@ from synapse.handlers.room import ShutdownRoomResponse from synapse.logging.opentracing import trace from synapse.metrics.background_process_metrics import run_as_background_process from synapse.rest.admin._base import assert_user_is_admin -from synapse.storage.state import StateFilter from synapse.streams.config import PaginationConfig from synapse.types import JsonDict, Requester, StreamKeyType +from synapse.types.state import StateFilter from synapse.util.async_helpers import ReadWriteLock from synapse.util.stringutils import random_string from synapse.visibility import filter_events_for_client