Samuel Wolff 349a8f02cc Merge remote-tracking branch 'origin/samu_masken' ...

# Conflicts:
#	src/main/java/Logik/Mahlzeit.java

2024-01-26 08:08:41 +01:00

..

Account.java

Kommentiert und getestet

2024-01-19 10:27:20 +01:00

ElternAccount.java

KinderErstellen

2024-01-13 14:29:57 +01:00

Kind.java

Kommentiert und getestet

2024-01-19 10:27:20 +01:00

Mahlzeit.java

Merge remote-tracking branch 'origin/samu_masken'

2024-01-26 08:08:41 +01:00

MitarbeiterAccount.java

KinderErstellen

2024-01-13 14:29:57 +01:00

Tagesplan.java

god knows what I did here

2024-01-18 13:00:46 +01:00

Zutat.java

Inhaltsstoffe in Filter Maske anzeigen

2024-01-23 14:58:19 +01:00