diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-13 13:50:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-13 13:50:57 +0100 |
| commit | 5989637f37b127f2a0c55ef0b1085ebd0d2928c1 (patch) | |
| tree | 0480f8a77111f35aede6622e7ff0ed8329b6a6dd /synapse/config/homeserver.py | |
| parent | Comments (diff) | |
| parent | Merge pull request #196 from matrix-org/erikj/room_history (diff) | |
| download | synapse-5989637f37b127f2a0c55ef0b1085ebd0d2928c1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index fe0ccb6eb7..d77f045406 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -25,12 +25,13 @@ from .registration import RegistrationConfig from .metrics import MetricsConfig from .appservice import AppServiceConfig from .key import KeyConfig +from .saml2 import SAML2Config class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, - VoipConfig, RegistrationConfig, - MetricsConfig, AppServiceConfig, KeyConfig,): + VoipConfig, RegistrationConfig, MetricsConfig, + AppServiceConfig, KeyConfig, SAML2Config, ): pass |