diff options
| author | Erik Johnston <erik@matrix.org> | 2017-06-26 14:02:44 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-06-26 14:02:44 +0100 |
| commit | e3cbec10c10e64c8388c4030191c141a8cbe4966 (patch) | |
| tree | 6a4eacab98c581406eacf47c392b7a41fa00118f /synapse/app | |
| parent | Reject local events that don't round trip the DB (diff) | |
| parent | Merge pull request #2301 from xwiki-labs/push-redact-content (diff) | |
| download | synapse-e3cbec10c10e64c8388c4030191c141a8cbe4966.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_round_trip
Diffstat (limited to 'synapse/app')
| -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 |