[Mahgs] c62524aa8a Merge remote-tracking branch 'origin/master' into JavaDocComments ...

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

2020-03-26 15:06:44 +01:00

..

mops/gruppen2

Merge remote-tracking branch 'origin/master' into JavaDocComments

2020-03-26 15:06:44 +01:00