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 /tests/storage/test_profile.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 'tests/storage/test_profile.py')
-rw-r--r-- | tests/storage/test_profile.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py index 45824bd3b2..24c7fe16c3 100644 --- a/tests/storage/test_profile.py +++ b/tests/storage/test_profile.py @@ -16,7 +16,7 @@ from twisted.internet import defer -from synapse.storage.profile import ProfileStore +from synapse.storage.data_stores.main.profile import ProfileStore from synapse.types import UserID from tests import unittest |