diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-03 18:25:17 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-03 18:25:17 +0100 |
| commit | d72ce4da64416eb10224e6a6b55aecdd27967b6b (patch) | |
| tree | ec86c93b1ebaf0ebb11f9e9d2a5377f608ab98b2 /synapse/config/homeserver.py | |
| parent | Make registering and logging in with a threepid work in the webclient. (diff) | |
| parent | Fix ban path (diff) | |
| download | synapse-d72ce4da64416eb10224e6a6b55aecdd27967b6b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts: synapse/http/client.py
Diffstat (limited to 'synapse/config/homeserver.py')
| -rw-r--r-- | synapse/config/homeserver.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py index a9aa4c735c..76e2cdeddd 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 matrix.org +# Copyright 2014 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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__': |