Commit Graph
10 Commits
Author SHA1 Message Date
PBS2H22AHE f0d87b0e43 Merge pull request 'Max' (#13) from Max into master
Reviewed-on: #13
2024-01-19 10:56:26 +01:00
PBS2H22AHE c5a179a0d2 Wochenuebersicht kommentiert und getestet 2024-01-19 10:49:55 +01:00
PBS2H22AHE 1073423b16 Merge remote-tracking branch 'origin/master' into Max 2024-01-19 10:33:11 +01:00
PBS2H22AHE 0741325aa6 Merge remote-tracking branch 'origin/master' into Max
# Conflicts:
#	src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
2024-01-19 08:17:50 +01:00
PBS2H22AHE afb53d8863 Merge remote-tracking branch 'origin/Max' into Max
# Conflicts:
#	src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
2024-01-19 08:09:37 +01:00
PBS2H22AHE 0326d80a21 Merge branch 'master' of https://git.bib.de/Subway-Surfers/VPR_App into Max_EssensverwaltungMitarbeiter 2024-01-15 08:29:18 +01:00
PBS2H22AHE 93a443ebe1 Merge remote-tracking branch 'origin/Max_EssensverwaltungMitarbeiter' into Max_EssensverwaltungMitarbeiter
# Conflicts:
#	.idea/misc.xml
#	src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
#	src/main/resources/de/subway_surfers/vpr_app/layout.css
2024-01-15 08:23:16 +01:00
PBS2H22AHE 412d9d7497 EssensverwaltungMitarbeiterView fertig 2023-12-20 08:25:05 +01:00
PBS2H22AHE 2b719ea39f test 2023-12-13 12:47:18 +01:00
PBS2H22AHE 2652f5e9ac EssensverwaltungMitarbeiter Maske 2023-12-13 12:43:22 +01:00