summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-04-03 11:29:43 +0100
committerRichard van der Hoff <richard@matrix.org>2020-04-03 11:29:43 +0100
commit6dd6a3557c3ac0d515145ba0b5ab3a4b24bb4c03 (patch)
tree01b0b3bf33e8a964df23b63a49547e2e8c664bff /synapse/appservice
parentFix device list update stream ids going backward (#7158) (diff)
parentRevert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white... (diff)
downloadsynapse-6dd6a3557c3ac0d515145ba0b5ab3a4b24bb4c03.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions