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

author Tom Hughes <tom@compton.nu>

Fri, 24 Jan 2025 15:00:25 +0000 (15:00 +0000)

committer Tom Hughes <tom@compton.nu>

Fri, 24 Jan 2025 15:00:25 +0000 (15:00 +0000)
author Tom Hughes <tom@compton.nu>
Fri, 24 Jan 2025 15:00:25 +0000 (15:00 +0000)
committer Tom Hughes <tom@compton.nu>
Fri, 24 Jan 2025 15:00:25 +0000 (15:00 +0000)
diff --cc app/controllers/application_controller.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Fri, 24 Jan 2025 15:00:25 +0000 (15:00 +0000)
committer	Tom Hughes <tom@compton.nu>
	Fri, 24 Jan 2025 15:00:25 +0000 (15:00 +0000)