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

author Tom Hughes <tom@compton.nu>

Sun, 6 Apr 2025 08:57:55 +0000 (09:57 +0100)

committer Tom Hughes <tom@compton.nu>

Sun, 6 Apr 2025 08:57:55 +0000 (09:57 +0100)
author Tom Hughes <tom@compton.nu>
Sun, 6 Apr 2025 08:57:55 +0000 (09:57 +0100)
committer Tom Hughes <tom@compton.nu>
Sun, 6 Apr 2025 08:57:55 +0000 (09:57 +0100)
diff --cc app/assets/javascripts/index/layers/data.js
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sun, 6 Apr 2025 08:57:55 +0000 (09:57 +0100)
committer	Tom Hughes <tom@compton.nu>
	Sun, 6 Apr 2025 08:57:55 +0000 (09:57 +0100)