2 commits

Author	SHA1	Message	Date
l10n daemon script	9d3fe2cba0	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-02-10 05:23:38 +01:00
Nicolas Fella	e298b73f8e	Find my phone runner ... Summary: Allows ringing devices from KRunner Test Plan: Enter find, ring, or device name, activate entry Reviewers: #kde_connect, #plasma, broulik, davidedmundson, apol Reviewed By: #kde_connect, apol Subscribers: sredman, apol, kdeconnect Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D14607	2019-02-08 23:59:42 +01:00