diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-28 17:53:24 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-28 17:53:24 +0000 |
| commit | 2f6ad79a80a167b094e4ecd1894bae9b1cd15675 (patch) | |
| tree | ea04c29e90a9335f6a4bfa199e9f4b4adfdc9ded /synapse/config/homeserver.py | |
| parent | Pull out sender when computing search results (diff) | |
| parent | Docs (diff) | |
| download | synapse-2f6ad79a80a167b094e4ecd1894bae9b1cd15675.tar.xz | |
Merge branch 'erikj/context_api' into erikj/search
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 3039f3c0bf..4743e6abc5 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -27,12 +27,14 @@ from .appservice import AppServiceConfig from .key import KeyConfig from .saml2 import SAML2Config from .cas import CasConfig +from .password import PasswordConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, - AppServiceConfig, KeyConfig, SAML2Config, CasConfig): + AppServiceConfig, KeyConfig, SAML2Config, CasConfig, + PasswordConfig,): pass |