- 30 Apr, 2019 4 commits
-
-
Nicolas Fella authored
-
-
Simon Redman 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"
-
- 28 Apr, 2019 3 commits
-
-
Nicolas Fella authored
-
Nicolas Fella authored
-
Nicolas Fella authored
-
- 25 Apr, 2019 1 commit
-
-
Nicolas Fella authored
-
- 23 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"
-
- 22 Apr, 2019 2 commits
-
-
Nicolas Fella authored
This avoid detaching the QJsonObject
-
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 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"
-
- 19 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"
-
- 18 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"
-
- 17 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"
-
- 16 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"
-
- 15 Apr, 2019 1 commit
-
-
Albert Vaca Cintora authored
The alternative using puropose is less mature than this and some of us were missing the good old dolphin plugin. This reverts commit a19713fb. # Conflicts: # CMakeLists.txt
-
- 14 Apr, 2019 5 commits
-
-
Nicolas Fella authored
-
Nicolas Fella authored
-
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"
-
- 12 Apr, 2019 1 commit
-
-
Matthijs Tijink authored
-
- 11 Apr, 2019 1 commit
-
-
Volker Krause authored
Handling those URLs works perfectly fine already, for transferring the phone number and the body, we just need to register for it.
-
- 10 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"
-
- 08 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"
-
- 02 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"
-
- 31 Mar, 2019 2 commits
-
-
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"
-
- 30 Mar, 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"
-
- 29 Mar, 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"
-
- 28 Mar, 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"
-
- 27 Mar, 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"
-
- 26 Mar, 2019 1 commit
-
-
- 25 Mar, 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"
-
- 24 Mar, 2019 3 commits
-
-
Nicolas Fella authored
It breaks icons in several places This reverts commit 2538a6a3.
-
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"
-
- 23 Mar, 2019 1 commit
-
-
Nicolas Fella authored
-