Files
neochat/src
l10n daemon script 79acceb29a 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-12-30 01:34:45 +00:00
..
2025-12-21 13:57:59 -05:00
2025-12-26 18:30:46 +00:00
2025-09-15 14:15:38 +02:00
2025-12-26 18:58:28 +00:00