 AndiBuls
|
8ae28d2de7
|
Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe
# Conflicts:
# src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
|
2020-03-06 16:50:11 +01:00 |
|
|
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 |
|
|
AndiBuls
|
bdd2fc37a9
|
changed name for html file
|
2020-03-06 14:30:56 +01:00 |
|
|
AndiBuls
|
05a7e72079
|
Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe
|
2020-03-06 14:24:18 +01:00 |
|
|
AndiBuls
|
d0d9bc91b5
|
Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe
|
2020-03-06 13:19:33 +01:00 |
|
|
AndiBuls
|
480f893f56
|
Merge branch 'master' into html-gruppe
|
2020-03-06 13:18:07 +01:00 |
|
|
AndiBuls
|
0a751c58b6
|
added index.html
|
2020-03-05 14:18:17 +01:00 |
|
|
AndiBuls
|
c73c84ec6d
|
added folder for documentation
|
2020-03-03 15:30:51 +01:00 |
|