Files
neochat/src
l10n daemon script 7b5b8197bc 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"
2022-09-07 01:48:36 +00:00
..
2021-08-23 19:38:56 +02:00
2021-10-03 13:43:20 +02:00
2021-10-03 13:43:20 +02:00
2022-07-10 21:43:57 +00:00
2021-04-18 17:47:22 +02:00
2021-04-18 17:47:22 +02:00
2022-09-05 19:27:55 +00:00
2021-08-23 19:38:56 +02:00
2021-08-23 19:38:56 +02:00
2021-08-23 19:38:56 +02:00
2022-09-05 19:27:55 +00:00
2022-09-05 19:27:55 +00:00
2021-08-23 19:38:56 +02:00
2021-11-13 19:11:47 +01:00
2021-08-23 19:38:56 +02:00
2021-04-18 17:47:22 +02:00
2021-08-03 20:06:36 +02:00
2021-10-21 20:00:50 +00:00
2022-08-26 12:52:46 +02:00
2021-09-29 22:38:45 +02:00
2022-09-05 19:27:55 +00:00
2021-08-23 19:38:56 +02:00
2022-08-26 12:52:46 +02:00
2022-08-25 13:46:09 +00:00
2021-12-22 14:23:47 +00:00
2022-08-25 13:46:09 +00:00
2022-08-25 13:46:09 +00:00
2022-08-26 12:52:46 +02:00
2022-09-05 19:27:55 +00:00
2022-04-01 10:56:19 +00:00
2021-09-07 11:27:13 +00:00
2021-12-25 15:30:20 +01:00
2021-09-07 11:27:13 +00:00
2021-11-13 19:11:47 +01:00
2021-04-06 19:25:06 +02:00
2021-08-23 19:38:56 +02:00
2021-08-23 19:38:56 +02:00