l10n daemon script 8c675a32c3 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-24 10:05:11 +01:00
..
contents/ui	solve loop when a new activity is created	2018-11-28 15:43:31 +01:00
Messages.sh	add a very simple activity switcher	2016-09-05 16:05:48 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-24 10:05:11 +01:00