summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-20 11:43:24 +0000
committerErik Johnston <erik@matrix.org>2015-02-20 11:43:24 +0000
commite944b767d7cffdb65c96863b1ebba2cceb6d3166 (patch)
tree9d684e2f0e4dce58e295a0623392a29a5bd4a5e2 /synapse/config/homeserver.py
parentUpdate CHANGES.rst with missing changes (diff)
parentAlways allow AS to register (diff)
downloadsynapse-e944b767d7cffdb65c96863b1ebba2cceb6d3166.tar.xz
Merge pull request #84 from matrix-org/disable_registration
Disable Registration Config Option
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py3
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