summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-28 13:39:39 +0000
committerErik Johnston <erik@matrix.org>2020-01-28 13:39:39 +0000
commit33f904835ae9966e48e7815d5f7959738f7d2da0 (patch)
tree8a76abb2bb48757f0e4351fbfd57e3cee3a535a4 /tox.ini
parentAdd `rooms.room_version` column (#6729) (diff)
parent1.9.1 (diff)
downloadsynapse-33f904835ae9966e48e7815d5f7959738f7d2da0.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions