diff options
author | Erik Johnston <erik@matrix.org> | 2021-08-18 17:02:47 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-08-18 17:02:47 +0100 |
commit | 78a70a2e0bdff5bdf02ba093eefab0b16ebefd73 (patch) | |
tree | 8de7b7805a9840101b00529a50812d6ffcb99cc4 /synapse/app/admin_cmd.py | |
parent | Fix weakref_slot parameter for room member storage attrs. (#10642) (diff) | |
parent | Update docs/upgrade.md with new version (diff) | |
download | synapse-78a70a2e0bdff5bdf02ba093eefab0b16ebefd73.tar.xz |
Merge branch 'release-v1.41' into develop
Diffstat (limited to 'synapse/app/admin_cmd.py')
-rw-r--r-- | synapse/app/admin_cmd.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py index 3234d9ebba..7396db93c6 100644 --- a/synapse/app/admin_cmd.py +++ b/synapse/app/admin_cmd.py @@ -38,7 +38,6 @@ from synapse.replication.slave.storage.groups import SlavedGroupServerStore from synapse.replication.slave.storage.push_rule import SlavedPushRuleStore from synapse.replication.slave.storage.receipts import SlavedReceiptsStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore -from synapse.replication.slave.storage.room import RoomStore from synapse.server import HomeServer from synapse.util.logcontext import LoggingContext from synapse.util.versionstring import get_version_string @@ -58,7 +57,6 @@ class AdminCmdSlavedStore( SlavedPushRuleStore, SlavedEventStore, SlavedClientIpStore, - RoomStore, BaseSlavedStore, ): pass |