diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-21 14:50:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 14:50:24 +0100 |
| commit | b668112320be62fe60582366bd3c6c9fa4f481a1 (patch) | |
| tree | 8cbccbe76026f26b05a7544cc8d12f6aee38c96e /synapse/app/user_dir.py | |
| parent | Merge pull request #2219 from krombel/avoid_duplicate_filters (diff) | |
| parent | Initialise exclusive_user_regex (diff) | |
| download | synapse-b668112320be62fe60582366bd3c6c9fa4f481a1.tar.xz | |
Merge pull request #2296 from matrix-org/erikj/dont_appserver_shar
Don't work out users who share room with appservice users
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 9d8edaa8e3..6d2aebe8de 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -25,8 +25,8 @@ from synapse.http.site import SynapseSite from synapse.http.server import JsonResource from synapse.metrics.resource import MetricsResource, METRICS_PREFIX from synapse.replication.slave.storage._base import BaseSlavedStore -from synapse.replication.slave.storage.events import SlavedEventStore from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore +from synapse.replication.slave.storage.events import SlavedEventStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore from synapse.replication.tcp.client import ReplicationClientHandler from synapse.rest.client.v2_alpha import user_directory |