Skip to content
  • Albert Vaca Cintora's avatar
    Merge branch 'master' into 1.x · 0dbaceaf
    Albert Vaca Cintora authored
    # Conflicts:
    #	plugins/battery/kdeconnect_battery.json
    #	plugins/clipboard/kdeconnect_clipboard.json
    #	plugins/findmyphone/kdeconnect_findmyphone.json
    #	plugins/kdeconnect.notifyrc
    #	plugins/lockdevice/kdeconnect_lockdevice.json
    #	plugins/mousepad/kdeconnect_mousepad.json
    #	plugins/mpriscontrol/kdeconnect_mpriscontrol.json
    #	plugins/mprisremote/kdeconnect_mprisremote.json
    #	plugins/notifications/kdeconnect_notifications.json
    #	plugins/pausemusic/kdeconnect_pausemusic.json
    #	plugins/ping/kdeconnect_ping.json
    #	plugins/remotecommands/kdeconnect_remotecommands.json
    #	plugins/remotecontrol/kdeconnect_remotecontrol.json
    #	plugins/runcommand/kdeconnect_runcommand.json
    #	plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
    #	plugins/sendnotifications/kdeconnect_sendnotifications.json
    #	plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
    #	plugins/sftp/kdeconnect_sftp.json
    #	plugins/share/kdeconnect_share.json
    #	plugins/telephony/kdeconnect_telephony.json
    0dbaceaf