Commit Graph

17 Commits

Author SHA1 Message Date
349a8f02cc Merge remote-tracking branch 'origin/samu_masken'
# Conflicts:
#	src/main/java/Logik/Mahlzeit.java
2024-01-26 08:08:41 +01:00
7acd24e285 uuuhhhhhh 2024-01-24 11:44:01 +01:00
Avapox
f43dad000f Test 2024-01-23 15:35:25 +01:00
c6b4bc1cd1 Inhaltsstoffe in Filter Maske anzeigen 2024-01-23 14:58:19 +01:00
c182bd5714 Merge branch 'AccountsUeberarbeiten' 2024-01-19 10:27:54 +01:00
c358366869 Kommentiert und getestet 2024-01-19 10:27:20 +01:00
ee5fc5ded6 Merge remote-tracking branch 'origin/master' into samu_masken
# Conflicts:
#	src/main/java/de/subway_surfers/vpr_app/VerwaltungController.java
2024-01-19 08:11:12 +01:00
245323383d god knows what I did here 2024-01-18 13:00:46 +01:00
c5f7391631 Kinder und Eltern 2024-01-17 11:21:26 +01:00
4780f4403b KinderErstellen 2024-01-13 14:29:57 +01:00
8be72640a7 diverses 2024-01-08 11:13:24 +01:00
c967746bba Misc changes + Kommentare 2024-01-08 09:14:17 +01:00
3832d5a326 Merge pull request 'samu_masken' (#9) from samu_masken into master
Reviewed-on: #9
2023-12-20 09:56:31 +01:00
456e55a66e GSON works 2023-12-20 09:28:32 +01:00
8dd43b212e Einbindung Filter in Gerichtsverwaltung 2023-12-20 08:30:57 +01:00
ca919637a3 Kommentare + Regions 2023-12-13 00:01:35 +01:00
d69a3d6010 Klassen erstellt 2023-12-12 23:50:10 +01:00