l10n daemon script d636dff966 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-04-24 05:52:57 +02:00
..
chrome	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-24 05:52:57 +02:00
linux	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-24 05:52:57 +02:00
mac	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-20 06:00:37 +02:00
windows	Don't use subfolders for QML/Python extensions	2019-04-19 11:38:15 +02:00