summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-04-01 14:08:53 +0100
committerNeil Johnson <neil@matrix.org>2019-04-01 14:08:53 +0100
commit62988f73fd6f005835996f2c2134b8c09a515575 (patch)
treec5d5310246c9f97e97dbffcd59482159a7ab7a81 /tox.ini
parentCollect room-version variations into one place (#4969) (diff)
parent0.99.3 (diff)
downloadsynapse-62988f73fd6f005835996f2c2134b8c09a515575.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions