Files
l10n daemon script 7191a8df2c 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-02-15 09:18:39 +01:00
..
2010-11-10 17:49:01 +00:00
2018-10-14 20:54:39 +03:00
2018-07-17 14:45:09 +02:00
2018-10-14 20:54:39 +03:00
2018-07-17 14:38:06 +02:00
2018-10-14 20:54:39 +03:00
2016-08-19 12:43:24 -03:00
2018-10-14 20:54:39 +03:00
2018-10-14 20:54:39 +03:00
2018-10-14 20:54:39 +03:00
2018-07-17 14:38:06 +02:00
2018-07-17 14:45:09 +02:00