diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-04-04 00:38:21 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-04-04 00:38:21 +0100 |
| commit | 9f7dc2bef7cd39645ae74d96f2919a3f9fdb65ac (patch) | |
| tree | b818eb0b962de7e860584bb5286f98e60e12ac75 /synapse/config/homeserver.py | |
| parent | report image size (bytewise) in OG meta (diff) | |
| parent | Merge pull request #686 from matrix-org/markjh/doc_strings (diff) | |
| download | synapse-9f7dc2bef7cd39645ae74d96f2919a3f9fdb65ac.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
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 a08c170f1d..acf74c8761 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -29,13 +29,14 @@ from .key import KeyConfig from .saml2 import SAML2Config from .cas import CasConfig from .password import PasswordConfig +from .jwt import JWTConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, - PasswordConfig,): + JWTConfig, PasswordConfig,): pass |