diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-02-20 14:15:56 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-02-20 14:15:56 +0000 |
commit | 4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9 (patch) | |
tree | 43ac96a5b91bbc498228f44798cdc260de1f47c0 /synapse/config/api.py | |
parent | Apply the pusher http hack in the right place (#4692) (diff) | |
parent | Logging improvements for the pusher (#4691) (diff) | |
download | synapse-4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9.tar.xz |
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/api.py')
-rw-r--r-- | synapse/config/api.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/api.py b/synapse/config/api.py |