diff options
| author | Kegsay <kegsay@gmail.com> | 2015-04-01 13:51:15 +0100 |
|---|---|---|
| committer | Kegsay <kegsay@gmail.com> | 2015-04-01 13:51:15 +0100 |
| commit | 80a620a83a2282d8c740d20a8ca9147071287f2f (patch) | |
| tree | 3c8d7e4bc69871ac1316a5763d885e5f7a9ba7d7 /synapse/config/homeserver.py | |
| parent | Fix thinko whereby events *for the AS specifically* were not passed on. (diff) | |
| parent | Merge branch 'develop' into application-services-registration-script (diff) | |
| download | synapse-80a620a83a2282d8c740d20a8ca9147071287f2f.tar.xz | |
Merge pull request #116 from matrix-org/application-services-registration-script
Application services registration changes (PR #116)
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 |