diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-20 14:13:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-20 14:13:54 +0100 |
| commit | 00c281f6a481671c8c37b17aa4ec7216bc551b27 (patch) | |
| tree | 95d3dceb57e2edf136192ad32f7a7ccadbdbbeb1 /synapse/config/homeserver.py | |
| parent | Update change log (diff) | |
| parent | Merge pull request #880 from matrix-org/markjh/registered_user (diff) | |
| download | synapse-00c281f6a481671c8c37b17aa4ec7216bc551b27.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index fc2445484c..79b0534b3b 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -32,13 +32,15 @@ from .password import PasswordConfig from .jwt import JWTConfig from .ldap import LDAPConfig from .emailconfig import EmailConfig +from .workers import WorkerConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, - JWTConfig, LDAPConfig, PasswordConfig, EmailConfig,): + JWTConfig, LDAPConfig, PasswordConfig, EmailConfig, + WorkerConfig,): pass |