52 commits

Author	SHA1	Message	Date
l10n daemon script	83df9f1f47	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"	2019-11-27 05:46:04 +01:00
Nicolas Fella	fe22d26f85	Add missing file	2019-11-25 16:14:24 +01:00