2 commits

Author	SHA1	Message	Date
l10n daemon script	50a50dd28d	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"	2021-09-18 02:13:25 +00:00
Bhushan Shah	47a4f6d632	Add airplane mode in quicksettings ... Based on original patch from Nicolas Fella (cherry picked from commit ed9517161d)	2021-09-16 09:19:47 +00:00