ÄNDERUNG #5

Merged
hardmeidario merged 2 commits from Zweig_Florian into master 2022-10-04 11:28:50 +02:00

2 Commits (master)

Author SHA1 Message Date
Dario Hardmeier a2d700a18c Merge branch 'master' into Zweig_Florian
# Conflicts:
#	Content/hallo.txt
2022-10-04 11:28:13 +02:00
Florian Leisering 02212cf4e8 ÄNDERUNG 2022-10-04 10:28:31 +02:00