summary refs log tree commit diff
path: root/synmark
diff options
context:
space:
mode:
authorAndrew Morgan <andrewm@element.io>2022-06-28 16:47:21 +0100
committerAndrew Morgan <andrewm@element.io>2022-06-28 16:47:21 +0100
commit79c6b9e12b60b3f139dee83c54aecf49a1d71cd0 (patch)
tree541c686f093f4cdd7f7f06134798ef195ddd84be /synmark
parent1.62.0rc1 (diff)
parentfix linting error from the 1.61.1 main -> develop merge (diff)
downloadsynapse-1.62.0rc1.tar.xz
Merge branch 'develop' into release-v1.62 v1.62.0rc1
Diffstat (limited to 'synmark')
0 files changed, 0 insertions, 0 deletions