- 27 Jan, 2016 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"
-
- 26 Jan, 2016 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"
-
- 25 Jan, 2016 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"
-
- 24 Jan, 2016 1 commit
-
-
Heiko Becker authoredkcoreaddons_add_plugin has been introduced with KF5 5.10. Reviewers: plasma-devel Differential Revision: https://phabricator.kde.org/D851
-