Commit 2324e537 authored by Markus Krug's avatar Markus Krug

Merge branch 'redeWiedergabe_dev' into 'master'

macOS version of athen with comboBoxes

See merge request !73
parents c8b35780 b93295e8
Pipeline #9915 passed with stages
in 20 minutes and 25 seconds