- 21 May, 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
-
Laurent Montel authored
-
- 20 May, 2017 8 commits
-
-
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"
-
- 19 May, 2017 7 commits
-
-
Sandro Knauß authored
see: T6166
-
Laurent Montel authored
-
Laurent Montel authored
FIXED-IN: 5.5.2 BUG: 379988
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 18 May, 2017 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 15 May, 2017 5 commits
-
-
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"
-
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 May, 2017 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 12 May, 2017 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"
-
- 11 May, 2017 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-