diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-23 14:36:00 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-23 14:36:00 +0000 |
| commit | e25e0f4da9ac04aab6bcaacef3d2950963f673da (patch) | |
| tree | 4cfd61797f83c9ef7c6c3328faad52797560f313 /synapse/config/homeserver.py | |
| parent | Revert get_auth_chain changes (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-e25e0f4da9ac04aab6bcaacef3d2950963f673da.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
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 b0fe217459..c024535f52 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -22,11 +22,12 @@ from .repository import ContentRepositoryConfig from .captcha import CaptchaConfig from .email import EmailConfig from .voip import VoipConfig +from .registration import RegistrationConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, - EmailConfig, VoipConfig): + EmailConfig, VoipConfig, RegistrationConfig,): pass |