AndiBuls d218056649 Merge branch 'Services' into html-gruppe ...

# Conflicts:
#	src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/entities/Admin.java
#	src/main/java/mops/gruppen2/entities/Gruppe.java
#	src/main/java/mops/gruppen2/entities/GruppeRepository.java
#	src/main/java/mops/gruppen2/entities/Student.java
#	src/main/java/mops/gruppen2/entities/TeilnehmerRepository.java

2020-03-06 15:04:34 +01:00

..

main

Merge branch 'Services' into html-gruppe

2020-03-06 15:04:34 +01:00

test/java/mops/gruppen2

created GruppTest

2020-03-06 14:49:05 +01:00