Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
acc6431029 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"
2023-03-01 23:48:55 +00:00
Yari Polla
d37324ee43 quicksettings: add hotspot quicksetting 2023-03-01 16:25:49 +00:00