diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-12 15:06:18 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-12 15:06:18 +0100 |
commit | f6fde343a10890e2e8a509e82babb34dd0fbaf06 (patch) | |
tree | eab85df2d409119042a731667bd1cec1bc70028f /synapse/config/homeserver.py | |
parent | Remove unused room_id parameter (diff) | |
parent | Merge pull request #296 from matrix-org/markjh/eventstream_presence (diff) | |
download | synapse-f6fde343a10890e2e8a509e82babb34dd0fbaf06.tar.xz |
Merge remote-tracking branch 'origin/develop' into erikj/search
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 |