Commit c9e45b66 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'testing' of transfer.hft-stuttgart.de:root/m4lab_landing_page into testing

messed pulling before merging up
parents e1f1e733 d2f5ba59
Pipeline #385 passed with stage
in 6 seconds