tomvahl b499ae6c06 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 14:29:37 +01:00

..

java/mops/gruppen2

Merge branch 'Services' into html-gruppe

2020-03-06 14:29:37 +01:00

resources

change index.html

2020-03-06 14:21:43 +01:00