summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-12-30 15:13:49 +0000
committerMark Haines <mark.haines@matrix.org>2016-12-30 15:13:49 +0000
commitf576c34594e5bc6eaa83b32864a02f42aeaf0761 (patch)
tree27e9aff6be00ceffd365e9854ea82b117589b97b /tox.ini
parentMerge branch 'release-v0.18.6' into develop (diff)
parentMerge pull request #1731 from matrix-org/markjh/logging-memleak (diff)
downloadsynapse-f576c34594e5bc6eaa83b32864a02f42aeaf0761.tar.xz
Merge remote-tracking branch 'origin/release-v0.18.6' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions