Skip to content
  • Albert Vaca Cintora's avatar
    Merge branch 'master' (early part) into 1.x · 6124e527
    Albert Vaca Cintora authored
    # Conflicts:
    #	plugins/kdeconnect.notifyrc
    #	plugins/remotecommands/kdeconnect_remotecommands.json
    #	plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
    #	plugins/telephony/kdeconnect_telephony.json
    6124e527