summary refs log tree commit diff
path: root/snap
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-07-23 09:03:19 +0100
committerErik Johnston <erik@matrix.org>2021-07-23 09:03:19 +0100
commit683deee9a4be8400e72bb2de87b82912656597ac (patch)
treebedb7d836b7e395fb5cb59932f5586b7c90f6ab1 /snap
parentDisable msc2716 until Complement update is merged (#10463) (diff)
parentMerge tag 'v1.38.1' (diff)
downloadsynapse-683deee9a4be8400e72bb2de87b82912656597ac.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'snap')
0 files changed, 0 insertions, 0 deletions