diff options
author | Erik Johnston <erik@matrix.org> | 2019-06-11 17:25:16 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-06-11 17:25:16 +0100 |
commit | 7e68691ce947cac0a470d8b8df3332958686ccc1 (patch) | |
tree | 75987c8c6556edf9d14dd5878c1c63a5fae2e5fb /tox.ini | |
parent | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop (diff) | |
parent | 1.0.0 (diff) | |
download | synapse-7e68691ce947cac0a470d8b8df3332958686ccc1.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions