diff options
author | Paul Evans <leonerd@leonerd.org.uk> | 2015-03-13 17:31:10 +0000 |
---|---|---|
committer | Paul Evans <leonerd@leonerd.org.uk> | 2015-03-13 17:31:10 +0000 |
commit | e731d30d90680b98237aaff7e655f26e942f468c (patch) | |
tree | f04bf166aca228c53af3a1cb2d4626f4889cbf61 /synapse/config/homeserver.py | |
parent | Also bump dependency link version (diff) | |
parent | Merge remote-tracking branch 'origin/develop' into metrics (diff) | |
download | synapse-e731d30d90680b98237aaff7e655f26e942f468c.tar.xz |
Merge pull request #108 from matrix-org/metrics
Metrics
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r-- | synapse/config/homeserver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index c024535f52..241afdf872 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -23,11 +23,13 @@ from .captcha import CaptchaConfig from .email import EmailConfig from .voip import VoipConfig from .registration import RegistrationConfig +from .metrics import MetricsConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, - EmailConfig, VoipConfig, RegistrationConfig,): + EmailConfig, VoipConfig, RegistrationConfig, + MetricsConfig,): pass |