Merge branch 'Plasma/5.12'

Authored by broulik on Feb 21 2018, 4:37 PM.

Description

Merge branch 'Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
3b526a3a2aa9D10586broulik
[Task Manager] Limit badge label to a sane size 
Feb 21 2018
da2fd952ca46 jriddell
Update version number for 5.12.2 GIT_SILENT 
Feb 20 2018