Merge branch 'Plasma/5.8' into Plasma/5.10

Authored by broulik on Aug 7 2017, 2:12 PM.

Description

Merge branch 'Plasma/5.8' into Plasma/5.10

Merged Changes

CommitAuthorDetailsCommitted
03f9ab0f9149broulik
[Battery Monitor] Fix icon size for InhibitionHint 
Aug 7 2017