diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-04-03 11:29:43 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-04-03 11:29:43 +0100 |
commit | 6dd6a3557c3ac0d515145ba0b5ab3a4b24bb4c03 (patch) | |
tree | 01b0b3bf33e8a964df23b63a49547e2e8c664bff /synapse/config | |
parent | Fix device list update stream ids going backward (#7158) (diff) | |
parent | Revert "Revert "Merge pull request #7153 from matrix-org/babolivier/sso_white... (diff) | |
download | synapse-6dd6a3557c3ac0d515145ba0b5ab3a4b24bb4c03.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions