2 commits

Author	SHA1	Message	Date
l10n daemon script	f7ed3ac9f7	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2022-02-05 01:46:06 +00:00
Devin Lin	1f0db0efc6	quicksettings/nightcolor: Fix night color	2022-01-04 12:12:46 -05:00