summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-03 17:04:00 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-03 17:04:16 +0100
commitee2bcdec653edfc5316164f2a58bda64ed8b761f (patch)
tree0c88821530bc9f9124c6aa8f992e2cd42db1b757 /synapse/config/homeserver.py
parentBubble up SynapseErrors so expected failures aren't masked. (diff)
downloadsynapse-ee2bcdec653edfc5316164f2a58bda64ed8b761f.tar.xz
Limit the size of uploads
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 a9aa4c735c..1318a0eead 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -18,9 +18,10 @@ from .server import ServerConfig
 from .logger import LoggingConfig
 from .database import DatabaseConfig
 from .ratelimiting import RatelimitConfig
+from .repository import ContentRepositoryConfig
 
 class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
-                       RatelimitConfig):
+                       RatelimitConfig, ContentRepositoryConfig):
     pass
 
 if __name__=='__main__':