summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-10-25 17:04:59 +0100
committerGitHub <noreply@github.com>2018-10-25 17:04:59 +0100
commitc85e063302243d2c82da6e709cf1e93b5b3085e9 (patch)
tree05bde2fb78f07141bda83d0a4fa54f08c19ec55c /synapse/config/homeserver.py
parentMerge pull request #4081 from matrix-org/neilj/fix_mau_init (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... (diff)
downloadsynapse-c85e063302243d2c82da6e709cf1e93b5b3085e9.tar.xz
Merge pull request #4051 from matrix-org/erikj/alias_disallow_list
Add config option to control alias creation
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py

index b8d5690f2b..10dd40159f 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py
@@ -31,6 +31,7 @@ from .push import PushConfig from .ratelimiting import RatelimitConfig from .registration import RegistrationConfig from .repository import ContentRepositoryConfig +from .room_directory import RoomDirectoryConfig from .saml2 import SAML2Config from .server import ServerConfig from .server_notices_config import ServerNoticesConfig @@ -49,7 +50,7 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, WorkerConfig, PasswordAuthProviderConfig, PushConfig, SpamCheckerConfig, GroupsConfig, UserDirectoryConfig, ConsentConfig, - ServerNoticesConfig, + ServerNoticesConfig, RoomDirectoryConfig, ): pass