summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-16 09:56:15 +0100
committerErik Johnston <erik@matrix.org>2015-09-16 09:56:15 +0100
commit16026e60c5381abcfea12f55b57f8d0ce474c402 (patch)
tree871c67ac5af8b6f8db44e6a04d7b033a039a8a94 /tox.ini
parentBump version/changelog (diff)
parentUpdate changelog (diff)
downloadsynapse-16026e60c5381abcfea12f55b57f8d0ce474c402.tar.xz
Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse v0.10.0-r2
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions