Commit Graph

7 Commits (534d97365848f9a6b6391a73acef0024a7a57b69)

Author SHA1 Message Date
l10n daemon script 534d973658 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-12-16 05:37:13 +01:00
l10n daemon script ffb3dd67c1 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-11-28 05:58:25 +01:00
l10n daemon script a66537dd1c 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-11-17 05:16:42 +01:00
l10n daemon script 5c1a7f3878 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-11-16 05:08:09 +01:00
Johan Ouwerkerk d46680e3f2 Fixup desktop file: remove duplicate Icon entry 2019-11-03 16:52:18 +01:00
Bhushan Shah 3da22c1de6 install new icon file and edit metadata 2019-11-03 11:57:25 +05:30
Johan Ouwerkerk e6a53b6f3b Rebrand otpclient as Keysmith 2019-10-21 19:16:51 +02:00