- 24 Oct, 2019 1 commit
-
-
camilo higuita authored
-
- 30 Jul, 2019 6 commits
-
-
camilo higuita authored
-
camilo higuita authored
-
camilo higuita authored
-
camilo higuita authored
-
camilo higuita authored
-
camilo higuita authored
-
- 07 Jul, 2019 3 commits
-
-
camilo higuita authored
-
camilo higuita authored
-
camilo higuita authored
-
- 03 Jul, 2019 1 commit
-
-
Camilo higuita authored
-
- 02 Jul, 2019 2 commits
-
-
Camilo higuita authored
-
Camilo higuita authored
-
- 30 Jun, 2019 1 commit
-
-
camilo higuita authored
-
- 27 Jun, 2019 2 commits
-
-
camilo higuita authored
-
camilo higuita authored
-
- 26 Jun, 2019 1 commit
-
-
Script Kiddy authored
-
- 23 Jun, 2019 2 commits
-
-
camilo higuita authored
-
camilo higuita authored
-
- 20 Jun, 2019 4 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
-
camilo higuita authored
-
camilo higuita authored
-
- 16 Jun, 2019 1 commit
-
-
Camilo higuita authored
-
- 03 Jun, 2019 3 commits
-
-
Camilo higuita authored
-
Camilo higuita 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"
-
- 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
-
- 12 May, 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"
-
- 06 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
-
- 29 Apr, 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
-
- 28 Apr, 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
-
- 25 Apr, 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
-
- 23 Apr, 2019 2 commits
-
-
Camilo higuita authored
-
Camilo higuita authored
-