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

# Conflicts: # team.txt
2020-08-20 10:37:17 +02:00
parent 08fb6ef796 0defb5c917
commit 279346b47c
3 changed files with 15 additions and 3 deletions
--- a/team.txt
+++ b/team.txt
@@ -1 +1,3 @@
+Ngb,J. Neugebauer,ngb@helmholtz-bi.de
+simon.liebold,Simon Liebold,lieboldsimonpaul@gmail.com
 max.welz,Max Welz,maxwelz11202@gmail.com