diff options
| author | David Baker <dave@matrix.org> | 2017-10-02 16:20:41 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-10-02 16:20:41 +0100 |
| commit | 27955056e092b440ed00da13fe6326dd438bb900 (patch) | |
| tree | 8480cf26404b89993e6ffa6cadbabc477be19661 /synapse/config/homeserver.py | |
| parent | Merge pull request #2472 from matrix-org/erikj/groups_rooms (diff) | |
| parent | Merge pull request #2480 from matrix-org/rav/federation_client_logging (diff) | |
| download | synapse-27955056e092b440ed00da13fe6326dd438bb900.tar.xz | |
Merge branch 'develop' into erikj/groups_merged
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 b22cacf8dc..3f9d9d5f8b 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -34,6 +34,7 @@ from .password_auth_providers import PasswordAuthProviderConfig from .emailconfig import EmailConfig from .workers import WorkerConfig from .push import PushConfig +from .spam_checker import SpamCheckerConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, @@ -41,7 +42,8 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, JWTConfig, PasswordConfig, EmailConfig, - WorkerConfig, PasswordAuthProviderConfig, PushConfig,): + WorkerConfig, PasswordAuthProviderConfig, PushConfig, + SpamCheckerConfig,): pass |