l10n daemon script e4ba37109f 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-06-09 05:13:32 +02:00
..
contents/code	Support CriticalNotification type and place it in a CriticalNotificationLayer	2019-05-02 10:29:38 +02:00
CMakeLists.txt
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-09 05:13:32 +02:00