Commit 81cba1fc authored by Jan Möbius's avatar Jan Möbius

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

parents 8bb952d8 9c5e7aa0
Pipeline #14281 passed with stages
in 49 minutes and 43 seconds