summary refs log tree commit diff
path: root/syweb/webclient/app-controller.js
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-02-03 21:05:52 +0000
committerRichard van der Hoff <richard@matrix.org>2021-02-03 21:05:52 +0000
commit03e762ac9120c92895f9e5bd3121456567e53aef (patch)
treea8878d7f50dbc1033f2357258ec0c752ca6c2368 /syweb/webclient/app-controller.js
parentMerge remote-tracking branch 'origin/release-v1.27.0' into fosdem-2021 (diff)
parentMerge remote-tracking branch 'origin/release-v1.27.0' into social_login_hotfixes (diff)
downloadsynapse-fosdem-2021.tar.xz
Merge branch 'social_login_hotfixes' into fosdem-2021 github/fosdem-2021 fosdem-2021
Diffstat (limited to 'syweb/webclient/app-controller.js')
0 files changed, 0 insertions, 0 deletions