Merge branch 'Plasma/5.12' into master

Authored by maximilianocuria on May 5 2018, 10:01 AM.

Description

Merge branch 'Plasma/5.12' into master

Merged Changes

CommitAuthorDetailsCommitted
8da1a47035fcD12702maximilianocuria
Avoid giving an stderr to kwallet 
May 5 2018