Merge branch 'Plasma/5.13'

Authored by marten on Jun 19 2018, 7:05 PM.

Description

Merge branch 'Plasma/5.13'

Merged Changes

CommitAuthorDetailsCommitted
f040cdb399b1marten
Set X-KDE-PluginInfo-Name=touchpad in KDED desktop file 
Jun 19 2018
3432c3342b1fmarten
Revert "Touchpad KDED module: Convert to JSON metadata" 
Jun 19 2018