- 25 Jun, 2022 2 commits
-
-
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"
-
Script Kiddy authored
-
- 20 Jun, 2022 1 commit
-
-
Laurent Montel authored
-
- 14 Jun, 2022 1 commit
-
-
Script Kiddy authored
-
- 04 Jun, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 43545809)
-
- 28 May, 2022 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 May, 2022 1 commit
-
-
Albert Astals Cid authored
-
- 19 May, 2022 1 commit
-
-
Script Kiddy authored
-
- 07 May, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 6b430375)
-
- 03 May, 2022 1 commit
-
-
Laurent Montel authored
-
- 14 Apr, 2022 1 commit
-
-
Script Kiddy authored
-
- 12 Apr, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit f70b265f)
-
- 08 Apr, 2022 1 commit
-
-
Laurent Montel authored
-
- 01 Apr, 2022 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
-
- 20 Mar, 2022 4 commits
-
-
Nicolas Fella authored -
Nicolas Fella 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"
-
- 12 Mar, 2022 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
-
- 27 Feb, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit b813ccba)
-
- 31 Jan, 2022 1 commit
-
-
Laurent Montel authored
-
- 28 Jan, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 106067f3)
-
- 21 Jan, 2022 1 commit
-
-
Laurent Montel authored
-
- 18 Jan, 2022 1 commit
-
-
Laurent Montel authored
-
- 03 Jan, 2022 1 commit
-
-
Heiko Becker authored
(cherry picked from commit a68c3d0c)
-
- 29 Dec, 2021 1 commit
-
-
Laurent Montel authored
-
- 28 Dec, 2021 1 commit
-
-
Laurent Montel authored
-
- 15 Dec, 2021 1 commit
-
-
Laurent Montel authored
-
- 11 Dec, 2021 1 commit
-
-
Albert Astals Cid authored
(cherry picked from commit 16c7f21c)
-
- 30 Nov, 2021 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 15 Nov, 2021 1 commit
-
-
Laurent Montel authored
-
- 09 Nov, 2021 1 commit
-
-
Laurent Montel authored
-
- 08 Nov, 2021 1 commit
-
-
Heiko Becker authored
-
- 06 Nov, 2021 1 commit
-
-
Nicolás Alvarez authored
-
- 31 Oct, 2021 1 commit
-
-
Heiko Becker authored
(cherry picked from commit 3d9704e7)
-
- 25 Oct, 2021 1 commit
-
-
Laurent Montel authored
-