diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-23 12:03:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 12:03:03 +0100 |
| commit | 7b6d99fa5aed2d8e0f71e75b12b26ade24701963 (patch) | |
| tree | c96bca83c8dba442c63c52e8e18bae29a1eb8ce8 /synapse/app/synchrotron.py | |
| parent | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... (diff) | |
| download | synapse-7b6d99fa5aed2d8e0f71e75b12b26ade24701963.tar.xz | |
Merge pull request #6231 from matrix-org/erikj/refactor_stores
Refactor storage layer to support multiple databases
Diffstat (limited to 'synapse/app/synchrotron.py')
| -rw-r--r-- | synapse/app/synchrotron.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 473026fce5..6a7e2fa707 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -54,8 +54,8 @@ from synapse.rest.client.v1.initial_sync import InitialSyncRestServlet from synapse.rest.client.v1.room import RoomInitialSyncRestServlet from synapse.rest.client.v2_alpha import sync from synapse.server import HomeServer +from synapse.storage.data_stores.main.presence import UserPresenceState from synapse.storage.engines import create_engine -from synapse.storage.presence import UserPresenceState from synapse.util.httpresourcetree import create_resource_tree from synapse.util.manhole import manhole from synapse.util.stringutils import random_string |