diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-25 18:21:00 +0100 |
| commit | 697f6714a4c65cec6019231a7bac84e1b544c42d (patch) | |
| tree | 8693ec59f906c076abb534f01c32573619bf7c8c /synapse/config/homeserver.py | |
| parent | Bump versions and changelog (diff) | |
| parent | Just use a yaml list for turn servers (diff) | |
| download | synapse-697f6714a4c65cec6019231a7bac84e1b544c42d.tar.xz | |
Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse v0.3.4
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 |