diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-24 13:13:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-24 13:13:51 +0100 |
| commit | ff13c5e7af3ae6b6469acc0aeee01ffb7be144c6 (patch) | |
| tree | 73287e2ea5c82bcb573136105f0095b1f226a6c8 /synapse/config/homeserver.py | |
| parent | Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloads (diff) | |
| parent | Change the config file generator to more descriptive explanation of push.reda... (diff) | |
| download | synapse-ff13c5e7af3ae6b6469acc0aeee01ffb7be144c6.tar.xz | |
Merge pull request #2301 from xwiki-labs/push-redact-content
Add configuration parameter to allow redaction of content from push m…
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 0f890fc04a..b22cacf8dc 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -33,6 +33,7 @@ from .jwt import JWTConfig from .password_auth_providers import PasswordAuthProviderConfig from .emailconfig import EmailConfig from .workers import WorkerConfig +from .push import PushConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, @@ -40,7 +41,7 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, JWTConfig, PasswordConfig, EmailConfig, - WorkerConfig, PasswordAuthProviderConfig,): + WorkerConfig, PasswordAuthProviderConfig, PushConfig,): pass |