diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-09-16 08:52:21 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-09-16 08:52:21 -0400 |
commit | ab165994dba29ae8730da28cbe8c60d6a904f234 (patch) | |
tree | 4fa5f1d17e0ed6f30e6d35899feda4fd242062cf /tox.ini | |
parent | Merge branch 'erikj/fix_origin_check' into release-v1.20.0 (diff) | |
parent | 1.19.2 (diff) | |
download | synapse-ab165994dba29ae8730da28cbe8c60d6a904f234.tar.xz |
Merge remote-tracking branch 'origin/master' into release-v1.20.0
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions