diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-28 13:39:42 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-28 13:39:42 +0100 |
| commit | 327ca883ec51780ea2a914d3c89ca0499f4656ac (patch) | |
| tree | dc3f2c06cdbbfce8b1d1bb6a4db31a8852f5b43a /synapse/config/homeserver.py | |
| parent | Quickly fix dodgy est. time remaining (diff) | |
| parent | Merge pull request #126 from matrix-org/csauth (diff) | |
| download | synapse-327ca883ec51780ea2a914d3c89ca0499f4656ac.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index 3edfadb98b..efbdd93c25 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -20,7 +20,6 @@ from .database import DatabaseConfig from .ratelimiting import RatelimitConfig from .repository import ContentRepositoryConfig from .captcha import CaptchaConfig -from .email import EmailConfig from .voip import VoipConfig from .registration import RegistrationConfig from .metrics import MetricsConfig @@ -29,7 +28,7 @@ from .appservice import AppServiceConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, - EmailConfig, VoipConfig, RegistrationConfig, + VoipConfig, RegistrationConfig, MetricsConfig, AppServiceConfig,): pass |