Commit ff274277 authored by gitlab-qa-bot's avatar gitlab-qa-bot

Merge branch 'test-conflicts' into 'master'

Test conflicts

See merge request !14778
parents 3c45906b 8dff76d7
Pipeline #12674887 failed with stages