summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-04-23 11:45:29 +0100
committerDavid Baker <dave@matrix.org>2015-04-23 11:45:29 +0100
commit2e0d9219b9585801ac8a8b5f3911107643ea3519 (patch)
tree0ec0854a37f54603f3d976b14a3c4a37d0a105ea /synapse/config/homeserver.py
parentpep8 (diff)
downloadsynapse-2e0d9219b9585801ac8a8b5f3911107643ea3519.tar.xz
Remove now-redundant email config
Diffstat (limited to '')
-rw-r--r--synapse/config/homeserver.py3
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