Merge branch 'Plasma/5.12'

Authored by kossebau on Apr 11 2018, 6:00 PM.

Description

Merge branch 'Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
d678a4c88473kossebau
[Media Frame] Fix config pages to fit themselves into dialog 
Apr 11 2018