diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-13 10:33:00 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-13 10:33:00 +0100 |
| commit | f96b48067065b12654f60a7d8849eebeb5338a73 (patch) | |
| tree | 1b9edd18e4e8c4f2218756b501292fde1fcb252e /synapse/config/homeserver.py | |
| parent | Start spliting out the rooms into joined and invited in v2 sync (diff) | |
| parent | Merge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff) | |
| download | synapse-f96b48067065b12654f60a7d8849eebeb5338a73.tar.xz | |
Merge branch 'develop' into markjh/v2_sync_api
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index d77f045406..3039f3c0bf 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -26,12 +26,13 @@ from .metrics import MetricsConfig from .appservice import AppServiceConfig from .key import KeyConfig from .saml2 import SAML2Config +from .cas import CasConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, - AppServiceConfig, KeyConfig, SAML2Config, ): + AppServiceConfig, KeyConfig, SAML2Config, CasConfig): pass |