Merge branch 'master' of edugit.org:Teckids/team-foss/schul-frei/schul-frei.org

2 jobs for master
in 42 seconds and was queued for 0 seconds