Commit df0f9afe authored by Lucas Sulzbach's avatar Lucas Sulzbach

Merge branch 'issue/611' into 'develop'

SCRUM#611: Prevents conflicts during dist-upgrade

See merge request !18
parents 6df32bda 7375aa53
Pipeline #18778 passed with stage
in 12 seconds