- 17 Apr, 2017 11 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
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"
-
- 16 Apr, 2017 12 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
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"
-
- 15 Apr, 2017 9 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 14 Apr, 2017 4 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 12 Apr, 2017 1 commit
-
-
Laurent Montel authored
-
- 09 Apr, 2017 3 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-