diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
| commit | 9970f955ce1ab36d21f7824d9f1382ab1df778e5 (patch) | |
| tree | 94f824e633ac9b9fab18171a67a6b94aec2839a9 /synapse/config/saml2_config.py | |
| parent | Newsfile (diff) | |
| parent | Fix races in room stats (and other) updates. (#6187) (diff) | |
| download | synapse-9970f955ce1ab36d21f7824d9f1382ab1df778e5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner
Diffstat (limited to 'synapse/config/saml2_config.py')
| -rw-r--r-- | synapse/config/saml2_config.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index ab34b41ca8..c407e13680 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -55,6 +55,8 @@ def _dict_merge(merge_dict, into_dict): class SAML2Config(Config): + section = "saml2" + def read_config(self, config, **kwargs): self.saml2_enabled = False |