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

author Tom Hughes <tom@compton.nu>

Sun, 18 Aug 2024 10:59:42 +0000 (11:59 +0100)

committer Tom Hughes <tom@compton.nu>

Sun, 18 Aug 2024 10:59:42 +0000 (11:59 +0100)
author Tom Hughes <tom@compton.nu>
Sun, 18 Aug 2024 10:59:42 +0000 (11:59 +0100)
committer Tom Hughes <tom@compton.nu>
Sun, 18 Aug 2024 10:59:42 +0000 (11:59 +0100)
diff --cc test/controllers/user_blocks_controller_test.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sun, 18 Aug 2024 10:59:42 +0000 (11:59 +0100)
committer	Tom Hughes <tom@compton.nu>
	Sun, 18 Aug 2024 10:59:42 +0000 (11:59 +0100)