- 03 Feb, 2023 2 commits
-
-
Script Kiddy authored
-
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"
-
- 02 Feb, 2023 2 commits
-
-
Script Kiddy authored
-
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"
-
- 31 Jan, 2023 1 commit
-
-
Script Kiddy authored
-
- 30 Jan, 2023 5 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Script Kiddy authored
-
- 29 Jan, 2023 2 commits
-
-
Heiko Becker authored
(cherry picked from commit 4b3c68f0)
-
Laurent Montel authored
-
- 25 Jan, 2023 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"
-
- 22 Jan, 2023 2 commits
-
-
Script Kiddy authored
-
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"
-
- 20 Jan, 2023 1 commit
-
-
Laurent Montel authored
-
- 19 Jan, 2023 2 commits
-
-
Script Kiddy authored
-
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"
-
- 18 Jan, 2023 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"
-
- 17 Jan, 2023 2 commits
-
-
Script Kiddy authored
-
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"
-
- 16 Jan, 2023 2 commits
-
-
Script Kiddy authored
-
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"
-
- 15 Jan, 2023 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"
-
- 14 Jan, 2023 3 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
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
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"
-
- 13 Jan, 2023 3 commits
-
-
Task: https://phabricator.kde.org/T14517 Relates to plasma/systemsettings!138
-
Script Kiddy authored
-
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"
-
- 07 Jan, 2023 1 commit
-
-
Script Kiddy authored
-
- 06 Jan, 2023 1 commit
-
-
Script Kiddy authored
-
- 04 Jan, 2023 1 commit
-
-
Script Kiddy authored
-
- 03 Jan, 2023 1 commit
-
-
Script Kiddy authored
-
- 02 Jan, 2023 1 commit
-
-
Albert Astals Cid authored
(cherry picked from commit 3a6ff1a5)
-
- 01 Jan, 2023 2 commits
-
-
Script Kiddy authored
-
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"
-
- 31 Dec, 2022 2 commits
-
-
Script Kiddy authored
-
Script Kiddy authored
-
- 30 Dec, 2022 1 commit
-
-
Script Kiddy authored
-