- 24 Jun, 2022 2 commits
-
-
Script Kiddy authoredIn case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
-
Script Kiddy authored
-
- 13 Jun, 2022 1 commit
-
-
Script Kiddy authored
-
- 04 Jun, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 8957d8fa)
-
- 31 May, 2022 1 commit
-
-
Script Kiddy authored
-
- 28 May, 2022 1 commit
-
-
Script Kiddy authored
-
- 24 May, 2022 1 commit
-
-
Script Kiddy authored
-
- 23 May, 2022 2 commits
-
-
-
Laurent Montel authored
-
- 07 May, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 449684cf)
-
- 03 May, 2022 1 commit
-
-
Laurent Montel authored
-
- 24 Apr, 2022 1 commit
-
-
Laurent Montel authored
-
- 12 Apr, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit f5440e2f)
-
- 06 Apr, 2022 1 commit
-
-
Laurent Montel authored
-
- 05 Apr, 2022 1 commit
-
-
Script Kiddy authored
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"
-
- 01 Apr, 2022 1 commit
-
-
Script Kiddy authored
-
- 29 Mar, 2022 1 commit
-
-
Script Kiddy authored
-
- 23 Mar, 2022 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 20 Mar, 2022 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 12 Mar, 2022 1 commit
-
-
Albert Astals Cid authored
-
- 27 Feb, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 4563578a)
-
- 09 Feb, 2022 1 commit
-
-
Script Kiddy authored
-
- 06 Feb, 2022 1 commit
-
-
Script Kiddy authored
-
- 28 Jan, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 66a73051)
-
- 11 Jan, 2022 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 08 Jan, 2022 1 commit
-
-
Laurent Montel authored
-
- 03 Jan, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 3a2b315e)
-
- 30 Dec, 2021 1 commit
-
-
Script Kiddy authored
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"
-
- 23 Dec, 2021 1 commit
-
-
Script Kiddy authored
-
- 22 Dec, 2021 3 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 21 Dec, 2021 1 commit
-
-
Laurent Montel authored
-
- 15 Dec, 2021 1 commit
-
-
Script Kiddy authored
-
- 11 Dec, 2021 1 commit
-
-
Albert Astals Cid authored
(cherry picked from commit 81476570)
-
- 08 Dec, 2021 1 commit
-
-
Friedrich W. H. Kossebau authoredThe latter is only for KF modules to use. GIT_SILENT
-
- 03 Dec, 2021 1 commit
-
-
Laurent Montel authored
-
