Merge remote-tracking branch 'upstream/release-v1.37'

synapse/config/homeserver.py

@@ -1,5 +1,4 @@
-# Copyright 2014-2016 OpenMarket Ltd
-# Copyright 2018 New Vector Ltd
+# Copyright 2021 The Matrix.org Foundation C.I.C.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,6 +30,7 @@ from .jwt import JWTConfig
 from .key import KeyConfig
 from .logger import LoggingConfig
 from .metrics import MetricsConfig
+from .modules import ModulesConfig
 from .oidc import OIDCConfig
 from .password_auth_providers import PasswordAuthProviderConfig
 from .push import PushConfig
@@ -58,6 +58,7 @@ class HomeServerConfig(RootConfig):
 
     config_classes = [
         MeowConfig,
+        ModulesConfig,
         ServerConfig,
         TlsConfig,
         FederationConfig,