Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
2 jobs for develop in 4 minutes and 25 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #9135
build-clang

00:02:24

passed #9134
build-gcc

00:02:01