diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-25 13:09:56 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-25 13:09:56 +0100 |
| commit | c58eb0d5a3ed9c4eac3b7af9d78a9ed1ae6da9fe (patch) | |
| tree | 85a1e05e91b0601e944295f7828af0b6e2cce814 /synapse/config/homeserver.py | |
| parent | Fix test where we changed arguments used to call the notifier (diff) | |
| parent | Add stun server fallback and I-told-you-so message if we get no TURN server a... (diff) | |
| download | synapse-c58eb0d5a3ed9c4eac3b7af9d78a9ed1ae6da9fe.tar.xz | |
Merge branch 'turn' 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 4b810a2302..5a11fd6c76 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -21,11 +21,12 @@ from .ratelimiting import RatelimitConfig from .repository import ContentRepositoryConfig from .captcha import CaptchaConfig from .email import EmailConfig +from .voip import VoipConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, - EmailConfig): + EmailConfig, VoipConfig): pass |