summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-29 13:34:38 +0100
committerErik Johnston <erik@matrix.org>2015-04-29 13:34:38 +0100
commit64991b0c8ba6f8aefe11ce2d7efcd2363c2ddae3 (patch)
treef2f2f8b40c3949de88ef340cd4f25fa854beca12 /synapse/config/homeserver.py
parentMerge pull request #135 from matrix-org/erikj/postgres_charset_check (diff)
parentbump database schema version (diff)
downloadsynapse-64991b0c8ba6f8aefe11ce2d7efcd2363c2ddae3.tar.xz
Merge pull request #129 from matrix-org/key_distribution
Key distribution v2
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index efbdd93c25..1c8ff38465 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -24,12 +24,13 @@ from .voip import VoipConfig
 from .registration import RegistrationConfig
 from .metrics import MetricsConfig
 from .appservice import AppServiceConfig
+from .key import KeyConfig
 
 
 class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
                        RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
                        VoipConfig, RegistrationConfig,
-                       MetricsConfig, AppServiceConfig,):
+                       MetricsConfig, AppServiceConfig, KeyConfig,):
     pass