diff options
| author | David Baker <dave@matrix.org> | 2016-10-14 15:10:38 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-10-14 15:10:38 +0100 |
| commit | bcb1245a2d4746d539ef60b9ca40e7ad16056efa (patch) | |
| tree | c5927411c6d329bbabbf3e41f8d98cda588b24ff /synapse/config/homeserver.py | |
| parent | Make password reset email field case insensitive (diff) | |
| parent | Merge pull request #1169 from matrix-org/erikj/fix_email_notifs (diff) | |
| download | synapse-bcb1245a2d4746d539ef60b9ca40e7ad16056efa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_insensitive
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 79b0534b3b..0f890fc04a 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -30,7 +30,7 @@ from .saml2 import SAML2Config from .cas import CasConfig from .password import PasswordConfig from .jwt import JWTConfig -from .ldap import LDAPConfig +from .password_auth_providers import PasswordAuthProviderConfig from .emailconfig import EmailConfig from .workers import WorkerConfig @@ -39,8 +39,8 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, - JWTConfig, LDAPConfig, PasswordConfig, EmailConfig, - WorkerConfig,): + JWTConfig, PasswordConfig, EmailConfig, + WorkerConfig, PasswordAuthProviderConfig,): pass |