summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-07-25 15:19:22 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-07-25 15:19:22 +0100
commitf16aa3a44ba4198af05b5419c77e37eb85c94b64 (patch)
tree9032b35f9279951971a6163155cda4e0afde4803 /tox.ini
parentMerge tag 'v1.2.0rc2' into develop (diff)
parent1.2.0 (diff)
downloadsynapse-f16aa3a44ba4198af05b5419c77e37eb85c94b64.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions