summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-05-11 00:19:26 +0100
committerRichard van der Hoff <richard@matrix.org>2018-05-11 00:19:26 +0100
commitbd8d0cfab1d6889e3a5656400cf4212da35224aa (patch)
treed7c6f45ee742673f80fd88af9e7eb5a4e6b46ec1 /setup.cfg
parentMerge pull request #3203 from matrix-org/rav/refactor_request_handler (diff)
parentmissing word :| (diff)
downloadsynapse-bd8d0cfab1d6889e3a5656400cf4212da35224aa.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions