summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-12-02 20:08:46 +0000
committerRichard van der Hoff <richard@matrix.org>2020-12-02 20:08:46 +0000
commit269ba1bc847b1df27e5ebba3d8cd1954a57561e4 (patch)
tree6a57f03750897cf5b97d8188e497f54ce104581c /demo
parentchangelog (diff)
parentMerge pull request #8858 from matrix-org/rav/sso_uia (diff)
downloadsynapse-269ba1bc847b1df27e5ebba3d8cd1954a57561e4.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/remove_unused_mocks
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions