diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-01 13:14:04 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-01 13:14:04 +0000 |
| commit | 4a9055d4465d5d6059612e7c89f2b5774efc0e18 (patch) | |
| tree | f5d146248431ce35f1ad810267024af4eb907bdf /synapse/config/homeserver.py | |
| parent | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-4a9055d4465d5d6059612e7c89f2b5774efc0e18.tar.xz | |
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2
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 |