summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-30 16:27:02 +0000
committerErik Johnston <erik@matrix.org>2020-10-30 16:27:02 +0000
commitf27a7896972d71af3ac21e82a81a64085fec32f1 (patch)
tree3562d5ce93b4f21c927a5229165b2aabe1605698 /tox.ini
parentMerge branch 'release-v1.22.1' into develop (diff)
parentFix changelog (diff)
downloadsynapse-f27a7896972d71af3ac21e82a81a64085fec32f1.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions