Commit c1816641 authored by Rafal Skolasinski's avatar Rafal Skolasinski

Merge branch 'stable': fix merge conflict caused by !246

parents b416e486 9604ddc5
Pipeline #12534 passed with stages
in 5 minutes and 59 seconds