Merge remote-tracking branch 'origin/Test_Branch' into main

Conflicts: Tutoren
Neuer Tutor Julian
2022-10-11 17:48:44 +02:00 · 2022-10-08 21:05:59 +02:00 · 2022-10-08 21:04:49 +02:00 · 2022-10-08 21:04:11 +02:00 · 2022-10-08 21:01:59 +02:00 · 2022-10-08 21:00:35 +02:00
2 changed files with 5 additions and 2 deletions
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+Tom
+Aytac
+Hinrik
+Julian
+
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-Hinrik
-Tom  Julian Aytacs
Author	SHA1	Message	Date
Hinrik Ehrenfried	d9a1c658ad	Merge remote-tracking branch 'origin/Test_Branch' into main Conflicts: Tutoren	2022-10-11 17:48:44 +02:00
Hinrik Ehrenfried	a72bf71843	Neuer Tutor Julian	2022-10-08 21:05:59 +02:00
Hinrik Ehrenfried	3469ec51db	Neuer Tutor Simon	2022-10-08 21:04:49 +02:00
Hinrik Ehrenfried	1056caa284	neuer Tutor Julian	2022-10-08 21:04:11 +02:00
Hinrik Ehrenfried	3306829325	tutoren erstellt	2022-10-08 21:01:59 +02:00
Hinrik Ehrenfried	b79a8ee5cb	merge	2022-10-08 21:00:35 +02:00
Hinrik Ehrenfried	17b85a7881	Merge remote-tracking branch 'origin/Hinrik_Test' into main Conflicts: Untitled 2	2022-10-08 20:59:58 +02:00
Hinrik Ehrenfried	f4f361fc69	p	2022-10-08 20:54:49 +02:00