diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-23 11:11:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-23 11:11:56 +0100 |
| commit | 259d10f0e4947f58e70998971b5d862a5ebe17d4 (patch) | |
| tree | 89ecd1b19ed7668d502418e7fbf1310ed68afaba /synapse/config/homeserver.py | |
| parent | Merge pull request #325 from matrix-org/markjh/filter_dicts (diff) | |
| parent | Fix receipts for room initial sync (diff) | |
| download | synapse-259d10f0e4947f58e70998971b5d862a5ebe17d4.tar.xz | |
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
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 |