Commit e183c87f by Máhonfai Bálint

Resolve merge conflict

parents a5572890 c3b43f25
Pipeline #963 failed with stage
in 0 seconds