Subway-Surfers/VPR_App
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Max #13

Merged
PBS2H22AHE merged 7 commits from Max into master 2024-01-19 10:56:27 +01:00
Conversation 0 Commits 7 Files Changed 7 +71 -49

7 Commits

Author SHA1 Message Date
Max Heer
c5a179a0d2 Wochenuebersicht kommentiert und getestet 2024-01-19 10:49:55 +01:00
Max Heer
1073423b16 Merge remote-tracking branch 'origin/master' into Max 2024-01-19 10:33:11 +01:00
Max Heer
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
Max Heer
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
Max Heer
0326d80a21 Merge branch 'master' of https://git.bib.de/Subway-Surfers/VPR_App into Max_EssensverwaltungMitarbeiter 2024-01-15 08:29:18 +01:00
Max Heer
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
Max Heer
412d9d7497 EssensverwaltungMitarbeiterView fertig 2023-12-20 08:25:05 +01:00