summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-27 12:12:54 +0000
committerErik Johnston <erik@matrix.org>2020-10-27 12:12:54 +0000
commit24229fac0511e8815752fa05f7533360ffe80ecf (patch)
tree30f6f38fda83acadfe78dc6915db8c8eebab391b /changelog.d
parente2e: ensure we have both master and self-signing key (#8455) (diff)
parent1.22.0 (diff)
downloadsynapse-24229fac0511e8815752fa05f7533360ffe80ecf.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d')
0 files changed, 0 insertions, 0 deletions