summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-06-06 12:28:15 +0100
committerNeil Johnson <neil@matrix.org>2018-06-06 12:28:15 +0100
commitfef6c2cdcc529aa7f36fcb8ae28cb7e3b8f4af15 (patch)
tree16ea9194a2b4447c4a4dda0e8f209ddcedf12dfd /tox.ini
parentMerge pull request #3349 from t3chguy/redact_as_request_token (diff)
parentMerge tag 'v0.31.0' (diff)
downloadsynapse-fef6c2cdcc529aa7f36fcb8ae28cb7e3b8f4af15.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions