XXNitram ef044cbdf7 Merge remote-tracking branch 'origin/master' into csv-error-handling ...

# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/User.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/resources/templates/createStudent.html

2020-03-19 17:01:32 +01:00

..

main

Merge remote-tracking branch 'origin/master' into csv-error-handling

2020-03-19 17:01:32 +01:00

test/java/mops/gruppen2

fix tests

2020-03-19 16:32:24 +01:00