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/initial_sync.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/initial_sync.py')
| -rw-r--r-- | synapse/handlers/initial_sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index a1fe9d116f..54c966c8a6 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -21,12 +21,12 @@ from synapse.api.constants import EventTypes, Membership from synapse.api.errors import AuthError, Codes, SynapseError from synapse.events.validator import EventValidator from synapse.handlers.presence import format_user_presence_state +from synapse.logging.context import make_deferred_yieldable, run_in_background from synapse.streams.config import PaginationConfig from synapse.types import StreamToken, UserID from synapse.util import unwrapFirstError from synapse.util.async_helpers import concurrently_execute from synapse.util.caches.snapshot_cache import SnapshotCache -from synapse.util.logcontext import make_deferred_yieldable, run_in_background from synapse.visibility import filter_events_for_client from ._base import BaseHandler |