summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-07 00:40:30 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-07 00:40:30 +0000
commit9d914454c857df4fcea42dbd2ca71ac294a6aba6 (patch)
treecc66e6cced36e99bee2229c914b97cdd350d56dc /tox.ini
parentMerge branch 'release-v0.18.6' into develop (diff)
parentRevert "fix typo breaking the fix to #1753" (diff)
downloadsynapse-9d914454c857df4fcea42dbd2ca71ac294a6aba6.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions