summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-09-16 13:50:10 +0100
committerErik Johnston <erik@matrix.org>2020-09-16 13:50:10 +0100
commit7c43643037a9800edfb67bf8258eb33b670c7a22 (patch)
tree9fdcbde20ade9942db0ab640340064151ba9d097 /docs
parentMerge branch 'erikj/fix_origin_check' into develop (diff)
parent1.19.2 (diff)
downloadsynapse-7c43643037a9800edfb67bf8258eb33b670c7a22.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions