Merge branch 'Plasma/5.12'

Authored by dvratil on Jan 16 2018, 4:15 PM.

Description

Merge branch 'Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
fd85ba8531a1D9902dvratil
KDED: restore output scale from config 
Jan 16 2018

Empty Commit

This commit is empty and does not affect any paths.