summary refs log tree commit diff
path: root/synapse/config/appservice.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-01-27 17:27:24 +0000
committerRichard van der Hoff <richard@matrix.org>2021-01-27 17:27:24 +0000
commit7fa1346f9323222b19c5ab7c50b354099684788f (patch)
tree2c56f5b63dcc3fe97aae730c85558d4a61a9bc01 /synapse/config/appservice.py
parentMerge branch 'master' into develop (diff)
parentImplement MSC2858 support (#9183) (diff)
downloadsynapse-7fa1346f9323222b19c5ab7c50b354099684788f.tar.xz
Merge branch 'social_login' into develop
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions