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

author Tom Hughes <tom@compton.nu>

Sun, 25 Feb 2024 14:06:56 +0000 (14:06 +0000)

committer Tom Hughes <tom@compton.nu>

Sun, 25 Feb 2024 14:06:56 +0000 (14:06 +0000)
author Tom Hughes <tom@compton.nu>
Sun, 25 Feb 2024 14:06:56 +0000 (14:06 +0000)
committer Tom Hughes <tom@compton.nu>
Sun, 25 Feb 2024 14:06:56 +0000 (14:06 +0000)
diff --cc app/controllers/api/changesets_controller.rb
Simple merge
diff --cc test/controllers/api/changesets_controller_test.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sun, 25 Feb 2024 14:06:56 +0000 (14:06 +0000)
committer	Tom Hughes <tom@compton.nu>
	Sun, 25 Feb 2024 14:06:56 +0000 (14:06 +0000)
		1	2
app/controllers/api/changesets_controller.rb	patch \|	diff1 \|	diff2 \|	blob \| history
test/controllers/api/changesets_controller_test.rb	patch \|	diff1 \|	diff2 \|	blob \| history