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

author Tom Hughes <tom@compton.nu>

Tue, 28 Jan 2025 18:23:33 +0000 (18:23 +0000)

committer Tom Hughes <tom@compton.nu>

Tue, 28 Jan 2025 18:23:33 +0000 (18:23 +0000)
author Tom Hughes <tom@compton.nu>
Tue, 28 Jan 2025 18:23:33 +0000 (18:23 +0000)
committer Tom Hughes <tom@compton.nu>
Tue, 28 Jan 2025 18:23:33 +0000 (18:23 +0000)
diff --cc app/assets/javascripts/index/layers/data.js
Simple merge
author	Tom Hughes <tom@compton.nu>
	Tue, 28 Jan 2025 18:23:33 +0000 (18:23 +0000)
committer	Tom Hughes <tom@compton.nu>
	Tue, 28 Jan 2025 18:23:33 +0000 (18:23 +0000)