Files
neochat/src
l10n daemon script c8ded65e46 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"
2025-08-07 01:33:59 +00:00
..
2025-08-07 00:21:10 +02:00
2025-08-01 12:11:35 +02:00
2025-08-07 00:19:18 +02:00