Merge remote-tracking branch 'origin/Plasma/5.11'
Conflicts:
ksmserver/themes/default/metadata.desktop [deleted in master]
lbeltrame | Dec 22 2017, 2:51 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
acd7034952bc | D9479 | anthonyfieroni | [widgetexplorer] Fix trying to show deleted dialog | Dec 22 2017 | ||
7f8fbece0f76 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Dec 22 2017 | |||
5a540fe5af5c | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Dec 20 2017 | |||
85a8de409082 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Dec 18 2017 |