Diffusion Milou 07a48b30adfd

Merge branch 'Plasma/5.12' into Plasma/5.16

Authored by fvogt on Jun 18 2019, 4:56 PM.

Description

Merge branch 'Plasma/5.12' into Plasma/5.16

Merged Changes

CommitAuthorDetailsCommitted
c918c2840bcbD21605fvogt
Don't give up if no results arrive after 500ms 
Jun 18 2019