summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorCaleb James DeLisle <cjd@cjdns.fr>2017-06-23 13:01:04 +0200
committerCaleb James DeLisle <cjd@cjdns.fr>2017-06-23 13:01:04 +0200
commit1591eddaea779d2805afb1acc102630a8e580f0d (patch)
tree409d544263d05f48766823b9d7ad0a90da74c1ea /synapse/config/homeserver.py
parentMerge pull request #2297 from matrix-org/erikj/user_dir_fix (diff)
downloadsynapse-1591eddaea779d2805afb1acc102630a8e580f0d.tar.xz
Add configuration parameter to allow redaction of content from push messages for google/apple devices
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index 0f890fc04a..327c7e4fc6 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 .pushconfig 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