diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-09-16 08:21:05 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-09-16 08:21:05 -0400 |
commit | bbb7ca1f157f43250a2373b194c7dee3dfbfca80 (patch) | |
tree | 50556bab7c122e4f42ba8ac13534c90849273c91 /synapse/server.py | |
parent | Merge remote-tracking branch 'origin/release-v1.20.0' into matrix-org-hotfixes (diff) | |
parent | Merge branch 'erikj/fix_origin_check' into release-v1.19.2 (diff) | |
download | synapse-bbb7ca1f157f43250a2373b194c7dee3dfbfca80.tar.xz |
Merge remote-tracking branch 'origin/release-v1.19.2' into matrix-org-hotfixes
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions