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

author Tom Hughes <tom@compton.nu>

Mon, 17 Jun 2024 16:22:38 +0000 (17:22 +0100)

committer Tom Hughes <tom@compton.nu>

Mon, 17 Jun 2024 16:22:38 +0000 (17:22 +0100)
author Tom Hughes <tom@compton.nu>
Mon, 17 Jun 2024 16:22:38 +0000 (17:22 +0100)
committer Tom Hughes <tom@compton.nu>
Mon, 17 Jun 2024 16:22:38 +0000 (17:22 +0100)
diff --cc test/controllers/diary_entries_controller_test.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Mon, 17 Jun 2024 16:22:38 +0000 (17:22 +0100)
committer	Tom Hughes <tom@compton.nu>
	Mon, 17 Jun 2024 16:22:38 +0000 (17:22 +0100)