l10n daemon script f0eb32c350 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"		2016-10-19 09:02:51 +00:00
..
contents/ui	Make it possible to toggle full notification contents by clicking on it	2016-10-04 01:12:04 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-19 09:02:51 +00:00