shas6395----- #56

Merged
shas6395 merged 7 commits from shas6395----- into master 2022-05-30 18:28:11 +02:00

7 Commits

Author SHA1 Message Date
739bb5fc6e Final version? 2022-05-30 18:21:43 +02:00
defc482611 Final version? 2022-05-30 18:04:05 +02:00
6a8aa8c4e1 Merge remote-tracking branch 'origin/master' 2022-05-30 17:45:12 +02:00
c1c098ad66 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/main.dart
2022-05-30 15:45:20 +02:00
5c428f8453 HomePage and Globals updated 2022-05-30 14:05:48 +02:00
3bac5c5c5c Merge remote-tracking branch 'origin/master' 2022-05-30 13:56:17 +02:00
2b6e2bb4ad HomePage and Globals updated 2022-05-30 13:42:12 +02:00