diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-09-05 23:32:51 -0700 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-09-05 23:32:51 -0700 |
| commit | 1a298aad9c3bbc1f0c80c40a1518c29c511f9fb4 (patch) | |
| tree | 8c27ca9b59021a5f9211cfb2c167ceaf083987d2 /synapse/config/homeserver.py | |
| parent | Fix generation of event ids so that they are consistent between local and rem... (diff) | |
| parent | Added instructions for setting up captcha in an obviously named file. (diff) | |
| download | synapse-1a298aad9c3bbc1f0c80c40a1518c29c511f9fb4.tar.xz | |
Added captcha support on both the HS and web client.
Merge branch 'captcha' of github.com:matrix-org/synapse into develop
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 76e2cdeddd..e16f2c733b 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -19,9 +19,10 @@ from .logger import LoggingConfig from .database import DatabaseConfig from .ratelimiting import RatelimitConfig from .repository import ContentRepositoryConfig +from .captcha import CaptchaConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, - RatelimitConfig, ContentRepositoryConfig): + RatelimitConfig, ContentRepositoryConfig, CaptchaConfig): pass if __name__=='__main__': |