diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-03 09:15:52 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-03 09:15:52 +0100 |
| commit | 30ad0c567437d19ebb4b172c12a2e22f65d2dd9a (patch) | |
| tree | 9961b92b2b0ea6084d0bdda11bf32cfde88fa833 /synapse/config/homeserver.py | |
| parent | howto: Link jsfiddles correctly. Hide ugly TODOs. (diff) | |
| parent | Fix tests to support ratelimiting (diff) | |
| download | synapse-30ad0c567437d19ebb4b172c12a2e22f65d2dd9a.tar.xz | |
Merge branch 'ratelimiting' into develop
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 18072e3196..a9aa4c735c 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py @@ -17,8 +17,10 @@ from .tls import TlsConfig from .server import ServerConfig from .logger import LoggingConfig from .database import DatabaseConfig +from .ratelimiting import RatelimitConfig -class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig): +class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, + RatelimitConfig): pass if __name__=='__main__': |