summary refs log tree commit diff
path: root/docs/sample_config.yaml
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-11-18 12:13:38 +0000
committerErik Johnston <erik@matrix.org>2020-11-18 12:13:38 +0000
commitb690542a34cc51b1f6ed186f9cb89668ef21a1f3 (patch)
tree04f74d785902960b4df660b76e2fef69dab3db4e /docs/sample_config.yaml
parentMerge pull request #8761 from matrix-org/rav/test_request_rendering (diff)
parentUpdate changelog (diff)
downloadsynapse-b690542a34cc51b1f6ed186f9cb89668ef21a1f3.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docs/sample_config.yaml')
0 files changed, 0 insertions, 0 deletions