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/app/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/app/homeserver.py')
-rwxr-xr-x | synapse/app/homeserver.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 606c9c650d..8a7cd07fec 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -247,6 +247,7 @@ def setup(): upload_dir=os.path.abspath("uploads"), db_name=config.database_path, tls_context_factory=tls_context_factory, + config=config, ) hs.register_servlets() |