summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-02-03 20:34:27 +0000
committerRichard van der Hoff <richard@matrix.org>2021-02-03 20:34:27 +0000
commit3f534d3fdf672d4118230304cdb04f9b68b5f28a (patch)
tree8bd44e694cf065681527161ee164ab929ad965b5 /synapse/http
parentconfig: Add detail to auto_join_rooms comment (#9291) (diff)
parentMerge remote-tracking branch 'origin/release-v1.27.0' into social_login_hotfixes (diff)
downloadsynapse-3f534d3fdf672d4118230304cdb04f9b68b5f28a.tar.xz
Merge branch 'social_login_hotfixes' into develop
Diffstat (limited to 'synapse/http')
0 files changed, 0 insertions, 0 deletions