XXNitram bf122457c2 Merge remote-tracking branch 'origin/master' into controllerAndControllerServiceRefactor ...

# Conflicts:
#	src/main/java/mops/gruppen2/service/ValidationService.java
#	src/test/java/mops/gruppen2/service/ControllerServiceTest.java

2020-03-27 15:33:45 +01:00

..

gruppen2

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

2020-03-27 15:33:45 +01:00