Commit 50a958a6 authored by Julian Kranz's avatar Julian Kranz

Merge branch 'armtranslation' of versioncontrolseidl.in.tum.de:zenzl/gdsl-toolkit into lovis

parents 6c6c8849 9d9a7446
Pipeline #1407 passed with stage
in 2 minutes and 30 seconds