summary refs log tree commit diff
path: root/synapse/federation/persistence.py
diff options
context:
space:
mode:
authorAmber H. Brown <hawkowl@atleastfornow.net>2019-07-05 23:49:13 +1000
committerAmber H. Brown <hawkowl@atleastfornow.net>2019-07-05 23:49:13 +1000
commita175e608e930d0facf37637876b9824b563d16aa (patch)
tree91caa588c913c99f1184063fee871d566859c92d /synapse/federation/persistence.py
parentlinting (diff)
parentMake errors about email password resets much clearer (#5616) (diff)
downloadsynapse-a175e608e930d0facf37637876b9824b563d16aa.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1
Diffstat (limited to '')
-rw-r--r--synapse/federation/persistence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py

index 7535f79203..d086e04243 100644 --- a/synapse/federation/persistence.py +++ b/synapse/federation/persistence.py
@@ -23,7 +23,7 @@ import logging from twisted.internet import defer -from synapse.util.logutils import log_function +from synapse.logging.utils import log_function logger = logging.getLogger(__name__)