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/_base.pyi | |
| 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/_base.pyi')
| -rw-r--r-- | synapse/config/_base.pyi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/_base.pyi b/synapse/config/_base.pyi index 86bc965ee4..3053fc9d27 100644 --- a/synapse/config/_base.pyi +++ b/synapse/config/_base.pyi @@ -24,6 +24,7 @@ from synapse.config import ( server, server_notices_config, spam_checker, + sso, stats, third_party_event_rules, tls, @@ -57,6 +58,7 @@ class RootConfig: key: key.KeyConfig saml2: saml2_config.SAML2Config cas: cas.CasConfig + sso: sso.SSOConfig jwt: jwt_config.JWTConfig password: password.PasswordConfig email: emailconfig.EmailConfig |