- 13 Aug, 2021 6 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 12 Aug, 2021 3 commits
-
-
Laurent Montel authored
-
Laurent Montel 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"
-
- 11 Aug, 2021 6 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel 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"
-
- 10 Aug, 2021 6 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 09 Aug, 2021 3 commits
-
-
Laurent Montel authored
-
Laurent Montel 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"
-
- 08 Aug, 2021 3 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 07 Aug, 2021 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 03 Aug, 2021 1 commit
-
-
Laurent Montel authored
-
- 31 Jul, 2021 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 30 Jul, 2021 3 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 29 Jul, 2021 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 20 Jul, 2021 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
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"
-
- 19 Jul, 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"
-