diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-02-12 13:24:09 +0000 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-02-12 13:24:09 +0000 |
commit | 47acbc519f7961698d3228e3c7bb15c5275ec7e9 (patch) | |
tree | 4aa3d9453918afdde72be64550e6ffe52b60a6ac /tests/server.py | |
parent | Use BSD-compatible in-place editing for sed. (#6887) (diff) | |
parent | Merge tag 'v1.10.0' (diff) | |
download | synapse-47acbc519f7961698d3228e3c7bb15c5275ec7e9.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'tests/server.py')
0 files changed, 0 insertions, 0 deletions