Merge branch 'master' of https://gitea.fhgr.ch/hardmeidario/Git_Playground

# Conflicts: # Content/hallo.txt
Anpassung
2022-10-04 10:02:58 +02:00 · 2022-10-04 09:48:43 +02:00
1 changed files with 3 additions and 1 deletions
--- a/Content/hallo.txt
+++ b/Content/hallo.txt
@ -1,3 +1,5 @@
 Toller Text

-Hallihallo
+Hallihallo
+
+Noch weitere tolle Inhalte.
Author	SHA1	Message	Date
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
Dario Hardmeier	701e0cf1cf	Anpassung	2022-10-04 09:48:43 +02:00