summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-07-19 21:48:28 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-07-19 21:48:28 +1000
commitfd9b08873c3f7dcee23a124bb0d2711f0d970195 (patch)
treeb3736d89568ba766cf0f42de2c8d000022b170fb /tox.ini
parentfixes (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-fd9b08873c3f7dcee23a124bb0d2711f0d970195.tar.xz
Merge remote-tracking branch 'origin/develop' into hawkowl/markdown
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions