diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-09 14:21:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-09 14:21:23 +0100 |
| commit | ba0406d10da32ebebf4185f01841f236371e0ae8 (patch) | |
| tree | 70f492094b7fb962a8161bd2304c6846b3ac3f40 /synapse/config/homeserver.py | |
| parent | Merge pull request #801 from ruma/readme-history-storage (diff) | |
| parent | Change CHANGELOG (diff) | |
| download | synapse-ba0406d10da32ebebf4185f01841f236371e0ae8.tar.xz | |
Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse v0.16.0
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index a08c170f1d..fc2445484c 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -29,13 +29,16 @@ from .key import KeyConfig from .saml2 import SAML2Config from .cas import CasConfig from .password import PasswordConfig +from .jwt import JWTConfig +from .ldap import LDAPConfig +from .emailconfig import EmailConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, - PasswordConfig,): + JWTConfig, LDAPConfig, PasswordConfig, EmailConfig,): pass |