diff options
author | Erik Johnston <erik@matrix.org> | 2015-09-16 09:56:15 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-09-16 09:56:15 +0100 |
commit | 16026e60c5381abcfea12f55b57f8d0ce474c402 (patch) | |
tree | 871c67ac5af8b6f8db44e6a04d7b033a039a8a94 /tox.ini | |
parent | Bump version/changelog (diff) | |
parent | Update changelog (diff) | |
download | synapse-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