diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-04-28 11:00:27 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-04-28 11:00:27 +0100 |
| commit | 9182f876645a27eb9599c99963876b12067fe93a (patch) | |
| tree | 158a1e1213f73f2395389d5a861b5eb07f8eb36f /synapse/config/homeserver.py | |
| parent | Merge pull request #133 from matrix-org/invite_power_level (diff) | |
| parent | Add commentage. (diff) | |
| download | synapse-9182f876645a27eb9599c99963876b12067fe93a.tar.xz | |
Merge pull request #126 from matrix-org/csauth
Client / Server Auth Refactor
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 |