Merge remote-tracking branch 'origin/Plasma/5.11'

Authored by lbeltrame on Dec 22 2017, 2:51 PM.

Description

Merge remote-tracking branch 'origin/Plasma/5.11'

Conflicts:
ksmserver/themes/default/metadata.desktop [deleted in master]

Merged Changes

CommitAuthorDetailsCommitted
acd7034952bcD9479anthonyfieroni
[widgetexplorer] Fix trying to show deleted dialog 
Dec 22 2017
7f8fbece0f76l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Dec 22 2017
5a540fe5af5cl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Dec 20 2017
85a8de409082l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Dec 18 2017