diff options
author | Erik Johnston <erik@matrix.org> | 2020-11-18 12:13:38 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-11-18 12:13:38 +0000 |
commit | b690542a34cc51b1f6ed186f9cb89668ef21a1f3 (patch) | |
tree | 04f74d785902960b4df660b76e2fef69dab3db4e /synapse/config | |
parent | Merge pull request #8761 from matrix-org/rav/test_request_rendering (diff) | |
parent | Update changelog (diff) | |
download | synapse-b690542a34cc51b1f6ed186f9cb89668ef21a1f3.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions