l10n daemon script da0089c741 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"		2020-04-09 11:01:28 +02:00
..
CMakeLists.txt	Add wrapper for macos dbus connection	2019-06-09 15:28:49 +00:00
dialog.ui	Allow to wrap label, so when we have a big url as when we send	2019-08-16 13:37:32 +02:00
kdeconnect-handler.cpp	T12394 Improve SMS URI display in kdeconnect-handler	2020-02-07 11:02:28 +00:00
Messages.sh	Introduce a URL handler and offer handling tel:/// urls	2017-06-09 13:42:16 +02:00
org.kde.kdeconnect.smshandler.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-09 11:01:28 +02:00
org.kde.kdeconnect.telhandler.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-07 10:16:35 +02:00