Commit Graph
10 Commits
Author SHA1 Message Date
tomvahl 2645e4dd84 change create.html index.html and search.html 2020-03-06 14:58:31 +01:00
tomvahl e4d91e53f5 Merge branch 'Services' into html-gruppe 2020-03-06 14:47:54 +01:00
tomvahl 5029f01ece Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe
# Conflicts:
#	src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
2020-03-06 14:32:20 +01:00
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
tomvahl c5b970ffc9 change index.html 2020-03-06 14:21:43 +01:00
tomvahl 18412accf8 change index.html 2020-03-06 13:18:53 +01:00
tomvahl 7dc7fafed7 change index.html 2020-03-05 19:04:27 +01:00
tomvahl 4b51e29edb fix html 2020-03-05 16:36:21 +01:00
tomvahl aecba724b4 change name 2020-03-05 13:59:24 +01:00
tomvahl 3bc6f76b65 add DTOs 2020-03-05 13:55:34 +01:00