summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-05-28 12:50:26 +0200
committerBrendan Abolivier <babolivier@matrix.org>2020-05-28 12:50:26 +0200
commit5cb470b4958162294e63730a82052349c608c43a (patch)
tree29f6bc5d3fdb4857ba9a6690cc5f60799d5b6166 /contrib
parentMerge pull request #7584 from matrix-org/erikj/save_and_send_fed_token_in_bg (diff)
parentUpdate debian changelog (diff)
downloadsynapse-5cb470b4958162294e63730a82052349c608c43a.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions