-
Albert Vaca Cintora authored
Conflicts: cli/kdeconnect-cli.cpp core/CMakeLists.txt plasmoid/package/contents/ui/FullRepresentation.qml plugins/ping/pingplugin.cpp
a303b732
Conflicts: cli/kdeconnect-cli.cpp core/CMakeLists.txt plasmoid/package/contents/ui/FullRepresentation.qml plugins/ping/pingplugin.cpp