summary refs log tree commit diff
path: root/synapse/visibility.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/visibility.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/visibility.py')
-rw-r--r--synapse/visibility.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/visibility.py b/synapse/visibility.py

index b443857571..e442de3173 100644 --- a/synapse/visibility.py +++ b/synapse/visibility.py
@@ -26,8 +26,8 @@ from synapse.events.utils import prune_event from synapse.logging.opentracing import trace from synapse.storage.controllers import StorageControllers from synapse.storage.databases.main import DataStore -from synapse.storage.state import StateFilter from synapse.types import RetentionPolicy, StateMap, get_domain_from_id +from synapse.types.state import StateFilter from synapse.util import Clock logger = logging.getLogger(__name__)