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

index 06defa8199..27bceac00e 100644 --- a/synapse/util/ratelimitutils.py +++ b/synapse/util/ratelimitutils.py
@@ -20,7 +20,7 @@ import logging from twisted.internet import defer from synapse.api.errors import LimitExceededError -from synapse.util.logcontext import ( +from synapse.logging.context import ( PreserveLoggingContext, make_deferred_yieldable, run_in_background,