Merge remote-tracking branch 'upstream/pull/4972'

author Tom Hughes <tom@compton.nu>

Wed, 10 Jul 2024 17:32:32 +0000 (18:32 +0100)

committer Tom Hughes <tom@compton.nu>

Wed, 10 Jul 2024 17:32:32 +0000 (18:32 +0100)
author Tom Hughes <tom@compton.nu>
Wed, 10 Jul 2024 17:32:32 +0000 (18:32 +0100)
committer Tom Hughes <tom@compton.nu>
Wed, 10 Jul 2024 17:32:32 +0000 (18:32 +0100)
diff --cc app/views/application/_auth_providers.html.erb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 10 Jul 2024 17:32:32 +0000 (18:32 +0100)
committer	Tom Hughes <tom@compton.nu>
	Wed, 10 Jul 2024 17:32:32 +0000 (18:32 +0100)