summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-03-26 12:26:58 +0000
committerErik Johnston <erik@matrix.org>2021-03-26 12:26:58 +0000
commit019010964de1e97dc14788f980af7f0943b9168c (patch)
tree54a7121169aa821adc4fce1cbc14f0bf8047289b /setup.py
parentPreserve host in example apache config (#9696) (diff)
parentUpdate cahngelog (diff)
downloadsynapse-019010964de1e97dc14788f980af7f0943b9168c.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions