summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-05-18 14:07:50 +0100
committerNeil Johnson <neil@matrix.org>2018-05-18 14:07:50 +0100
commit2725223f0818396665b49463c4d65c68e969c8fa (patch)
treeb2793e28392774fe7386d1a2ff8781b336af258e /tox.ini
parentMerge pull request #3232 from matrix-org/rav/server_notices_room (diff)
parentMerge tag 'v0.29.1' (diff)
downloadsynapse-2725223f0818396665b49463c4d65c68e969c8fa.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions