diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 17:16:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-02-23 17:16:03 +0000 |
| commit | bd84755e64a5fd086738a43e049885604ea53927 (patch) | |
| tree | 39b3bf10a5b074c82e48a723670a539b9149a8ee /synapse/config/homeserver.py | |
| parent | Pull the _get_event_cache.setdefault() call out of the try block, as it doesn... (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-bd84755e64a5fd086738a43e049885604ea53927.tar.xz | |
Merge remote-tracking branch 'origin/develop' into performance-cache-improvements
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 |