Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git

# Conflicts: # team.txt
2020-08-20 10:42:28 +02:00
parent 72a004410b ed44e30907
commit d02a0ffbd9
1 changed files with 1 additions and 0 deletions
--- a/team.txt
+++ b/team.txt
@@ -4,3 +4,4 @@ Jan,Jan.Landwehrmann,jan.landwehrmann@outlook.de
 lex.hung, Hung, khachunglexschule@gmail.com
 simon.liebold,Simon Liebold,lieboldsimonpaul@gmail.com
 Maja, Maja M<>rchen, maja.moerchen@gmail.com
+oliver.stankawitz,Oliver Stankawitz,oliver1011@gmx.de