Merge pull request #5362 from AntonKhorev/color-mode-preference-map

author Andy Allan <git@gravitystorm.co.uk>

Wed, 11 Dec 2024 16:53:15 +0000 (16:53 +0000)

committer GitHub <noreply@github.com>

Wed, 11 Dec 2024 16:53:15 +0000 (16:53 +0000)
author Andy Allan <git@gravitystorm.co.uk>
Wed, 11 Dec 2024 16:53:15 +0000 (16:53 +0000)
committer GitHub <noreply@github.com>
Wed, 11 Dec 2024 16:53:15 +0000 (16:53 +0000)
diff --cc app/assets/stylesheets/common.scss
Simple merge
diff --cc app/controllers/application_controller.rb
Simple merge
diff --cc config/locales/en.yml
Simple merge
author	Andy Allan <git@gravitystorm.co.uk>
	Wed, 11 Dec 2024 16:53:15 +0000 (16:53 +0000)
committer	GitHub <noreply@github.com>
	Wed, 11 Dec 2024 16:53:15 +0000 (16:53 +0000)
		1	2
app/assets/stylesheets/common.scss	patch \|	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	patch \|	diff1 \|	diff2 \|	blob \| history