diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-13 14:23:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-14 10:22:43 +0100 |
| commit | 6f7540ada44b26d6eced6788650a08df672d0610 (patch) | |
| tree | 37fbc9d465a630ec2ac244d8860b35bbfcbd697d /synapse/config/homeserver.py | |
| parent | Fix email push notifs being dropped (diff) | |
| parent | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete (diff) | |
| download | synapse-6f7540ada44b26d6eced6788650a08df672d0610.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs
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 |