Commit b4a7bb56 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'master' of www.graphics.rwth-aachen.de:OpenFlipper-Free/OpenFlipper-Free

parents b5153542 5743f8b2
Pipeline #13166 passed with stages
in 65 minutes and 30 seconds