diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-15 16:37:08 +0100 |
| commit | c2b4621630d982a38585c177d7c960c5127620bf (patch) | |
| tree | 8fdd440785ed56531c36e0f34e65fe139e6ce541 /synapse/config/homeserver.py | |
| parent | Incorporate review (diff) | |
| parent | Remove "user_id" from GET /presence. (#7606) (diff) | |
| download | synapse-c2b4621630d982a38585c177d7c960c5127620bf.tar.xz | |
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 2c7b3a699f..264c274c52 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -36,6 +36,7 @@ from .ratelimiting import RatelimitConfig from .redis import RedisConfig from .registration import RegistrationConfig from .repository import ContentRepositoryConfig +from .room import RoomConfig from .room_directory import RoomDirectoryConfig from .saml2_config import SAML2Config from .server import ServerConfig @@ -79,6 +80,7 @@ class HomeServerConfig(RootConfig): PasswordAuthProviderConfig, PushConfig, SpamCheckerConfig, + RoomConfig, GroupsConfig, UserDirectoryConfig, ConsentConfig, |