Merge pull request #26725 from nextcloud/fix-federated-scope-not-shown-when-public...

author John Molakvoæ <skjnldsv@users.noreply.github.com>

Fri, 22 Oct 2021 09:52:56 +0000 (11:52 +0200)

committer GitHub <noreply@github.com>

Fri, 22 Oct 2021 09:52:56 +0000 (11:52 +0200)
author John Molakvoæ <skjnldsv@users.noreply.github.com>
Fri, 22 Oct 2021 09:52:56 +0000 (11:52 +0200)
committer GitHub <noreply@github.com>
Fri, 22 Oct 2021 09:52:56 +0000 (11:52 +0200)
diff --cc apps/settings/js/settings/personalInfo.js
Simple merge
diff --cc apps/settings/lib/Settings/Personal/PersonalInfo.php
Simple merge
diff --cc apps/settings/templates/settings/personal/personal.info.php
Simple merge
author	John Molakvoæ <skjnldsv@users.noreply.github.com>
	Fri, 22 Oct 2021 09:52:56 +0000 (11:52 +0200)
committer	GitHub <noreply@github.com>
	Fri, 22 Oct 2021 09:52:56 +0000 (11:52 +0200)
		1	2
apps/settings/js/settings/personalInfo.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/settings/lib/Settings/Personal/PersonalInfo.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/settings/templates/settings/personal/personal.info.php	patch \|	diff1 \|	diff2 \|	blob \| history