diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-05 23:49:13 +1000 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-05 23:49:13 +1000 |
| commit | a175e608e930d0facf37637876b9824b563d16aa (patch) | |
| tree | 91caa588c913c99f1184063fee871d566859c92d /synapse/handlers/e2e_keys.py | |
| parent | linting (diff) | |
| parent | Make errors about email password resets much clearer (#5616) (diff) | |
| download | synapse-a175e608e930d0facf37637876b9824b563d16aa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into shhs shhs-v1.1.1
Diffstat (limited to 'synapse/handlers/e2e_keys.py')
| -rw-r--r-- | synapse/handlers/e2e_keys.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 807900fe52..55b4ab3a1a 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -23,8 +23,8 @@ from canonicaljson import encode_canonical_json, json from twisted.internet import defer from synapse.api.errors import CodeMessageException, FederationDeniedError, SynapseError +from synapse.logging.context import make_deferred_yieldable, run_in_background from synapse.types import UserID, get_domain_from_id -from synapse.util.logcontext import make_deferred_yieldable, run_in_background from synapse.util.retryutils import NotRetryingDestination logger = logging.getLogger(__name__) |