diff options
| author | Erik Johnston <erik@matrix.org> | 2017-06-26 14:02:44 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-06-26 14:02:44 +0100 |
| commit | e3cbec10c10e64c8388c4030191c141a8cbe4966 (patch) | |
| tree | 6a4eacab98c581406eacf47c392b7a41fa00118f /synapse/config/homeserver.py | |
| parent | Reject local events that don't round trip the DB (diff) | |
| parent | Merge pull request #2301 from xwiki-labs/push-redact-content (diff) | |
| download | synapse-e3cbec10c10e64c8388c4030191c141a8cbe4966.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_round_trip
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 |