Merge remote-tracking branch 'origin/Plasma/5.12'

Authored by lbeltrame on Jan 21 2018, 9:26 AM.

Description

Merge remote-tracking branch 'origin/Plasma/5.12'

Merged Changes

CommitAuthorDetailsCommitted
37aa02a33a86D9072mkoller
make it work with with git-lfs 
Jan 21 2018