Commit Graph

16 Commits (a2d700a18cfc2d5383c8c2fe79558df26e529a23)

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
Dario Hardmeier 6a0d990d8d Merge pull request 'änderung' (#4) from Branch-Christoph into master
Reviewed-on: http://10.0.254.95:3000/hardmeidario/Git_Playground/pulls/4
OK
2022-10-04 11:20:32 +02:00
chriguu 4614190efb Merge branch 'master' into Branch-Christoph
# Conflicts:
#	Content/hallo.txt
2022-10-04 11:18:16 +02:00
Florian Leisering 4e1e76dc35 Merge pull request 'Projektbeschrieb-verbessern' (#3) from Projektbeschrieb-verbessern into master
Reviewed-on: http://10.0.254.95:3000/hardmeidario/Git_Playground/pulls/3
2022-10-04 10:46:25 +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
Florian Leisering 02212cf4e8 ÄNDERUNG 2022-10-04 10:28:31 +02:00
chriguu 0c6824d017 änderung 2022-10-04 10:28:20 +02:00
Dario Hardmeier 737dda05db Beschreibung verbessert 2022-10-04 10:26:27 +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
Dario Hardmeier 47cf58fa1a Merge pull request 'Anpassung' (#2) from Dario_Second_Branch into master
Reviewed-on: http://10.0.254.95:3000/hardmeidario/Git_Playground/pulls/2
2022-10-04 08:33:28 +02:00
Dario Hardmeier 06418923b3 Anpassung 2022-10-04 08:31:42 +02:00
Dario Hardmeier 2f1839a719 Initial commit 2022-10-04 08:16:52 +02:00