summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-02-25 10:53:31 +0000
committerErik Johnston <erik@matrix.org>2021-02-25 10:53:31 +0000
commit1efdcc3e8724808996a7b60a60ca72c1b96fee0b (patch)
tree0c4d80707391fc3e6a68abd7b3646f79fa5d2cb8 /tox.ini
parentAdd support for X-Forwarded-Proto (#9472) (diff)
parentFixup changelog (diff)
downloadsynapse-1efdcc3e8724808996a7b60a60ca72c1b96fee0b.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions