l10n daemon script 176d03610d 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"		2020-01-13 09:40:45 +01:00
..
findmyphone	Don't build runners	2019-12-07 16:10:18 +00:00
remotecommands	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-13 09:40:45 +01:00