diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-24 22:31:25 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-24 22:31:25 -0400 |
| commit | c40d7244f8e07538a7ab25c255e803bc54fb7cb3 (patch) | |
| tree | a502c6063ce25bb2ddaa479a7ce64d705e52b261 /synapse/app/user_dir.py | |
| parent | don't error if federation query doesn't have cross-signing keys (diff) | |
| parent | Merge pull request #6248 from matrix-org/erikj/move_schema_files (diff) | |
| download | synapse-c40d7244f8e07538a7ab25c255e803bc54fb7cb3.tar.xz | |
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'synapse/app/user_dir.py')
| -rw-r--r-- | synapse/app/user_dir.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index e01afb39f2..a5d6dc7915 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -42,8 +42,8 @@ from synapse.replication.tcp.streams.events import ( ) from synapse.rest.client.v2_alpha import user_directory from synapse.server import HomeServer +from synapse.storage.data_stores.main.user_directory import UserDirectoryStore from synapse.storage.engines import create_engine -from synapse.storage.user_directory import UserDirectoryStore from synapse.util.caches.stream_change_cache import StreamChangeCache from synapse.util.httpresourcetree import create_resource_tree from synapse.util.manhole import manhole |