Christoph 551534d4ff Merge branch 'master' into refactor-controller ...

# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java

2020-03-25 13:03:22 +01:00

..

mops/gruppen2

Merge branch 'master' into refactor-controller

2020-03-25 13:03:22 +01:00