Commit e8679f39 by Bodor Máté

Resolve marge conflict

parents 15d24c7f be12f47f
Pipeline #805 failed with stage
in 1 minute 22 seconds