summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-28 14:56:32 +0100
committerErik Johnston <erik@matrix.org>2016-07-28 14:56:32 +0100
commit5fb41a955c9cf35fd25f92b39f58489dd77fb37e (patch)
tree2b90c7e1f54550a3af8c84e41f4b6cb9b8bb2bb1 /tox.ini
parentMerge pull request #962 from matrix-org/markjh/retry (diff)
parentAdd authors to changelog (diff)
downloadsynapse-5fb41a955c9cf35fd25f92b39f58489dd77fb37e.tar.xz
Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions