Commit ac9e1f4c authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/fix_merge_errors' into 'master'

fix problems after merge

See merge request !259
parents 4e161587 5522fcd3
Pipeline #5700 passed with stage
in 54 minutes and 45 seconds