Commit 7a9937ed authored by Marion Goedel's avatar Marion Goedel

Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere

parents abce0295 75ee4375
Pipeline #278143 passed with stages
in 135 minutes and 48 seconds