diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-07 18:05:39 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-07 18:05:39 +0100 |
| commit | 4fe95094d1aa9a8a36a32c56d5665ddba825e029 (patch) | |
| tree | d7e88a7b2ce0d41403c7a7afaff3b44088e60324 /synapse/config/homeserver.py | |
| parent | Retry on deadlock (diff) | |
| parent | update leo's contribs a bit (diff) | |
| download | synapse-4fe95094d1aa9a8a36a32c56d5665ddba825e029.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
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 |