10 Commits

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
chriguu
4614190efb Merge branch 'master' into Branch-Christoph
# Conflicts:
#	Content/hallo.txt
2022-10-04 11:18:16 +02:00
Dario Hardmeier
3ab5299c91 Korrektur 2022-10-04 10:41:11 +02:00
Dario Hardmeier
f841508a84 Content angepasst. 2022-10-04 10:31:27 +02:00
02212cf4e8 ÄNDERUNG 2022-10-04 10:28:31 +02:00
chriguu
0c6824d017 änderung 2022-10-04 10:28:20 +02:00
Dario Hardmeier
ed326df921 Merge branch 'master' of https://gitea.fhgr.ch/hardmeidario/Git_Playground
# Conflicts:
#	Content/hallo.txt
2022-10-04 10:02:58 +02:00
chriguu
19c8a6a66e Neuer Eintrag 2022-10-04 09:55:35 +02:00
Dario Hardmeier
701e0cf1cf Anpassung 2022-10-04 09:48:43 +02:00
Dario Hardmeier
ee232a1627 Content hinzugefügt 2022-10-04 09:27:47 +02:00