3 Commits

Author	SHA1	Message	Date
XXNitram	b24f6d273f	Fix merge with master	2020-03-19 17:24:10 +01:00
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
XXNitram	dc11536db3	Merge Erstellen and Veranstaltung into a single site ... add two Erstellen sites, one for orga and one for student Co-Authored-By: andibuls <andibuls@users.noreply.github.com> Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com> Co-Authored-By: kasch309 <kasch309@users.noreply.github.com> Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com> Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>	2020-03-19 16:50:52 +01:00