l10n daemon script ee1a535cc2 SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"		2019-05-08 05:42:59 +02:00
..
qml	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
CMakeLists.txt	Revert "Remove unneeded src"	2019-05-05 16:32:14 +00:00
conversationlistmodel.cpp	Check empty string using .isEmpty() instead of == ""	2019-04-30 10:11:57 -06:00
conversationlistmodel.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
conversationmodel.cpp	Check empty string using .isEmpty() instead of == ""	2019-04-30 10:11:57 -06:00
conversationmodel.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
main.cpp	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
org.kde.kdeconnect.sms.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-08 05:42:59 +02:00
resources.qrc	Refine SMS conversation view	2018-08-06 00:09:46 +02:00