diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-03-03 15:20:49 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-03-03 15:20:49 +0000 |
| commit | 43f874055d1dfc70496db3c1ac7e962515e4ff94 (patch) | |
| tree | d7274030db58fdca49cb03c316957d5907fa65e3 /synapse/config/homeserver.py | |
| parent | Validate the alt_aliases property of canonical alias events (#6971) (diff) | |
| parent | Update debian changelog (diff) | |
| download | synapse-43f874055d1dfc70496db3c1ac7e962515e4ff94.tar.xz | |
Merge branch 'master' into develop
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 6e348671c7..b4bca08b20 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -38,6 +38,7 @@ from .saml2_config import SAML2Config from .server import ServerConfig from .server_notices_config import ServerNoticesConfig from .spam_checker import SpamCheckerConfig +from .sso import SSOConfig from .stats import StatsConfig from .third_party_event_rules import ThirdPartyRulesConfig from .tls import TlsConfig @@ -65,6 +66,7 @@ class HomeServerConfig(RootConfig): KeyConfig, SAML2Config, CasConfig, + SSOConfig, JWTConfig, PasswordConfig, EmailConfig, |