diff options
| author | Erik Johnston <erikj@jki.re> | 2017-10-19 13:45:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 13:45:09 +0100 |
| commit | b4a6b7f7208fa1b7596b91cc4f57e0bf3653c510 (patch) | |
| tree | 89db7fae69a7c35632f8abefcc1c258c0b9ebccb /synapse/config/homeserver.py | |
| parent | Merge pull request #2558 from matrix-org/erikj/group_id_validation (diff) | |
| parent | Flake8 (diff) | |
| download | synapse-b4a6b7f7208fa1b7596b91cc4f57e0bf3653c510.tar.xz | |
Merge pull request #2559 from matrix-org/erikj/group_id_validation
Add config to enable group creation
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 3f9d9d5f8b..05e242aef6 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -35,6 +35,7 @@ from .emailconfig import EmailConfig from .workers import WorkerConfig from .push import PushConfig from .spam_checker import SpamCheckerConfig +from .groups import GroupsConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, @@ -43,7 +44,7 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, AppServiceConfig, KeyConfig, SAML2Config, CasConfig, JWTConfig, PasswordConfig, EmailConfig, WorkerConfig, PasswordAuthProviderConfig, PushConfig, - SpamCheckerConfig,): + SpamCheckerConfig, GroupsConfig,): pass |