- 04 Apr, 2016 3 commits
-
-
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"
-
Sandro Knauß authored
-
- 03 Apr, 2016 4 commits
-
-
Laurent Montel authored
-
Volker Krause 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"
-
Laurent Montel authored
-
- 02 Apr, 2016 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"
-
- 01 Apr, 2016 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 31 Mar, 2016 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"
-
- 30 Mar, 2016 7 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"
-
Laurent Montel authored
-
- 29 Mar, 2016 9 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"
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 28 Mar, 2016 6 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-