Merge branch 'Plasma/5.14'

Authored by davidedmundson on Oct 1 2018, 1:48 PM.

Description

Merge branch 'Plasma/5.14'

Merged Changes

CommitAuthorDetailsCommitted
dea0d82b2127davidedmundson
Merge branch 'Plasma/5.12' into Plasma/5.14 
Oct 1 2018
c2ea0afb5596D15869davidedmundson
Fallback to in-process prompt if logout prompt fails 
Oct 1 2018
69dcd548ed20davidedmundson
Merge branch 'Plasma/5.12' of git://anongit.kde.org/plasma-workspace into… 
Oct 1 2018
ab8207bde4acjriddell
Update version number for 5.12.7 GIT_SILENT 
Sep 25 2018
6f9721765017D12539hoffmannrobert/davidedmundson
Klipper: Do not insert secret data into history 
May 16 2018