- 04 Nov, 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"
-
- 01 Nov, 2019 1 commit
-
-
Christoph Feck authored
-
- 06 Oct, 2019 1 commit
-
-
Christoph Feck authored
-
- 01 Sep, 2019 1 commit
-
-
Christoph Feck authored
-
- 09 Aug, 2019 1 commit
-
-
Christoph Feck authored
-
- 29 Jul, 2019 1 commit
-
-
Christoph Feck authored
-
- 15 Jul, 2019 1 commit
-
-
Albert Astals Cid authored
-
- 16 Mar, 2019 1 commit
-
-
Albert Astals Cid authored
-
- 06 Jan, 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"
-
- 18 Nov, 2018 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"
-
- 10 Nov, 2018 1 commit
-
-
Albert Astals Cid authored
-
- 09 Nov, 2018 1 commit
-
-
Albert Astals Cid authored
-
- 16 Oct, 2018 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"
-
- 10 Oct, 2018 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"
-
- 18 Jul, 2018 3 commits
-
-
James Smith authored
-
James Smith authored
-
James Smith authored
-
- 16 Jul, 2018 1 commit
-
-
Albert Astals Cid authored
-
- 19 Mar, 2018 1 commit
-
-
Albert Astals Cid authored
-
- 07 Jan, 2018 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"
-
- 06 Jan, 2018 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"
-
- 05 Jan, 2018 1 commit
-
-
Laurent Montel authored
-
- 13 Nov, 2017 1 commit
-
-
Albert Astals Cid authored
-
- 28 Sep, 2017 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"
-
- 12 Aug, 2017 2 commits
-
-
Heiko Becker authored -
Heiko Becker authored
...by removing some superfluous semicolons.
-
- 08 Aug, 2017 1 commit
-
-
Albert Astals Cid authored
-
- 31 Jul, 2017 1 commit
-
-
Christoph Feck authored
-
- 28 Jul, 2017 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"
-
- 17 Jul, 2017 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
-
- 15 Jul, 2017 1 commit
-
-
Luigi Toscano authored
-
- 09 Jul, 2017 1 commit
-
-
Albert Astals Cid authored
-
- 11 Jun, 2017 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"
-
- 05 Jun, 2017 1 commit
-
-
Albert Astals Cid authored
-
- 08 May, 2017 1 commit
-
-
Albert Astals Cid authored
-
- 12 Apr, 2017 1 commit
-
-
Albert Astals Cid authored
-
- 08 Apr, 2017 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"
-
- 05 Apr, 2017 1 commit
-
-
Albert Astals Cid authored
-
- 20 Mar, 2017 1 commit
-
-
Albert Astals Cid authored
-