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

author Tom Hughes <tom@compton.nu>

Wed, 13 Nov 2024 18:40:02 +0000 (18:40 +0000)

committer Tom Hughes <tom@compton.nu>

Wed, 13 Nov 2024 18:40:02 +0000 (18:40 +0000)
author Tom Hughes <tom@compton.nu>
Wed, 13 Nov 2024 18:40:02 +0000 (18:40 +0000)
committer Tom Hughes <tom@compton.nu>
Wed, 13 Nov 2024 18:40:02 +0000 (18:40 +0000)
diff --cc CONTRIBUTING.md
Simple merge
diff --cc FAQ.md
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 13 Nov 2024 18:40:02 +0000 (18:40 +0000)
committer	Tom Hughes <tom@compton.nu>
	Wed, 13 Nov 2024 18:40:02 +0000 (18:40 +0000)
		1	2
CONTRIBUTING.md	patch \|	diff1 \|	diff2 \|	blob \| history
FAQ.md	patch \|	diff1 \|	diff2 \|	blob \| history