- 20 Aug, 2019 1 commit
-
-
Script Kiddy authoredIn 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 Aug, 2019 1 commit
-
-
Script Kiddy authored
-
- 14 Aug, 2019 1 commit
-
-
Script Kiddy authored
-
- 13 Aug, 2019 1 commit
-
-
Script Kiddy authored
-
- 12 Aug, 2019 1 commit
-
-
Script Kiddy authored
-
- 11 Aug, 2019 1 commit
-
-
Script Kiddy authored
-
- 10 Aug, 2019 1 commit
-
-
Script Kiddy authored
-
- 09 Aug, 2019 3 commits
-
-
Jonathan Riddell authored -
Jonathan Riddell authored
-
Script Kiddy authored
-
- 07 Aug, 2019 3 commits
-
-
Friedrich W. H. Kossebau authored -
Jonathan Riddell authored
(cherry picked from commit c083b501)
-
Jonathan Riddell authored
-
- 06 Aug, 2019 1 commit
-
-
Jonathan Riddell authored
-
- 05 Aug, 2019 1 commit
-
-
Friedrich W. H. Kossebau authored
-
- 03 Aug, 2019 1 commit
-
-
Script Kiddy authored
-
- 02 Aug, 2019 6 commits
-
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
-
- 01 Aug, 2019 1 commit
-
-
Jonathan Riddell authored
-
- 22 Jul, 2019 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
-
- 21 Jul, 2019 2 commits
-
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
-
- 17 Jul, 2019 3 commits
-
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
-
- 03 Jun, 2019 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"
-
- 27 May, 2019 2 commits
-
-
Kevin Funk authored -
Kevin Funk authored
-
- 20 May, 2019 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"
-
- 30 Apr, 2019 2 commits
-
-
Script Kiddy authored
-
Script Kiddy authored
-
- 20 Apr, 2019 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"
-
- 07 Mar, 2019 1 commit
-
-
Kevin Funk authored
-