diff options
| author | David Baker <dave@matrix.org> | 2015-04-17 13:51:10 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-04-17 13:51:10 +0100 |
| commit | cb03fafdf150cb97d494c1a12efb730e01309fb2 (patch) | |
| tree | 5c6994f2ec826599984d7a621caeb889aeef4c57 /synapse/config/homeserver.py | |
| parent | Register the 3pid servlet (diff) | |
| parent | Filter typing nofication events to only those rooms the requesting user is a ... (diff) | |
| download | synapse-cb03fafdf150cb97d494c1a12efb730e01309fb2.tar.xz | |
Merge branch 'develop' into csauth
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 241afdf872..3edfadb98b 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -24,12 +24,13 @@ from .email import EmailConfig from .voip import VoipConfig from .registration import RegistrationConfig from .metrics import MetricsConfig +from .appservice import AppServiceConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, EmailConfig, VoipConfig, RegistrationConfig, - MetricsConfig,): + MetricsConfig, AppServiceConfig,): pass |