diff options
author | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
---|---|---|
committer | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
commit | 9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6 (patch) | |
tree | 1034b986ea37a081707b489cb3ebe6e4d584defe /synapse/http/additional_resource.py | |
parent | Make the logging level configurable (diff) | |
parent | missing word :| (diff) | |
download | synapse-9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6.tar.xz |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/http/additional_resource.py')
0 files changed, 0 insertions, 0 deletions