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

author Tom Hughes <tom@compton.nu>

Thu, 4 Jul 2024 17:30:07 +0000 (18:30 +0100)

committer Tom Hughes <tom@compton.nu>

Thu, 4 Jul 2024 17:30:07 +0000 (18:30 +0100)
author Tom Hughes <tom@compton.nu>
Thu, 4 Jul 2024 17:30:07 +0000 (18:30 +0100)
committer Tom Hughes <tom@compton.nu>
Thu, 4 Jul 2024 17:30:07 +0000 (18:30 +0100)
diff --git a/app/assets/images/NoteMarker.svg b/assets/NoteMarker.svg

similarity index 100%

rename from app/assets/images/NoteMarker.svg

rename to assets/NoteMarker.svg
diff --git a/app/assets/images/color-palette.svg b/assets/color-palette.svg

similarity index 100%

rename from app/assets/images/color-palette.svg

rename to assets/color-palette.svg
author	Tom Hughes <tom@compton.nu>
	Thu, 4 Jul 2024 17:30:07 +0000 (18:30 +0100)
committer	Tom Hughes <tom@compton.nu>
	Thu, 4 Jul 2024 17:30:07 +0000 (18:30 +0100)
assets/NoteMarker.svg	[moved from app/assets/images/NoteMarker.svg with 100% similarity]	patch \| blob \| history
assets/color-palette.svg	[moved from app/assets/images/color-palette.svg with 100% similarity]	patch \| blob \| history