Commit Graph

51 Commits

Author SHA1 Message Date
8728ea36d7 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git 2020-08-20 10:54:06 +02:00
lex.hung
022ed78b33 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git 2020-08-20 10:54:02 +02:00
lex.hung
e7a953108e format 2020-08-20 10:53:51 +02:00
232f675003 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:53:46 +02:00
edcd6d1a2a Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git 2020-08-20 10:52:59 +02:00
13d13585b3 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:52:54 +02:00
lex.hung
8a4386ca80 format 2020-08-20 10:52:34 +02:00
80c244eec6 maxim derksen 2020-08-20 10:52:17 +02:00
2b67c3252f Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:51:36 +02:00
lex.hung
06c256b907 Format 2020-08-20 10:49:29 +02:00
Enno
c9b7c6f89c Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:48:27 +02:00
Enno
181806e5b3 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:47:59 +02:00
lex.hung
4699f993b8 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git 2020-08-20 10:46:57 +02:00
Tim
91cbef10d1 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:46:28 +02:00
lex.hung
320944339c Format 2020-08-20 10:46:26 +02:00
Tim
9cc9f938b0 Datei für Team-Details hinzugefügt 2020-08-20 10:45:08 +02:00
Enno
6bec7ae848 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:44:48 +02:00
oliver.stankawitz
b164b8f409 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:44:31 +02:00
Enno
8216d0f048 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:44:00 +02:00
oliver.stankawitz
de9262d4b1 Ordnung
hab ordnung gemacht
2020-08-20 10:43:57 +02:00
lex.hung
0f57bf044e Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:43:56 +02:00
Maja
b6b01f4018 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:43:11 +02:00
lex.hung
d5f641550a neues Format 2020-08-20 10:43:09 +02:00
Enno
e0c8b8aa87 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git 2020-08-20 10:42:35 +02:00
max.welz
83644ec5e8 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:42:30 +02:00
Maja
d02a0ffbd9 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:42:28 +02:00
Enno
6634b202e9 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:41:20 +02:00
Maja
72a004410b Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:41:16 +02:00
oliver.stankawitz
ed44e30907 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:40:29 +02:00
Maja
bb10119777 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:40:00 +02:00
bad32be812 Informationen
Artems infos hinzugefügt
2020-08-20 10:39:27 +02:00
Jan
ba38acdaff Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:39:22 +02:00
Enno
aa9bfe6554 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git 2020-08-20 10:38:55 +02:00
max.welz
04c30c8a6c Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git 2020-08-20 10:38:49 +02:00
Enno
421a0ed2ab Enno 2020-08-20 10:38:32 +02:00
oliver.stankawitz
29417cb02c Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git 2020-08-20 10:38:12 +02:00
max.welz
279346b47c Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:37:17 +02:00
oliver.stankawitz
4c4d64279f Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:37:14 +02:00
lex.hung
47d3701cad Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:37:02 +02:00
lex.hung
fbfbf9a6e6 Hung 2020-08-20 10:36:17 +02:00
Jan
425ff02d1b Jan e-mail 2020-08-20 10:34:52 +02:00
Maja
f42c7762ea Name und E-mail hinzugefügt 2020-08-20 10:33:56 +02:00
Simon Liebold
0defb5c917 Merge branch 'master' of https://git.ngb.schule/IF-LK-2020/einfuehrung-git
# Conflicts:
#	team.txt
2020-08-20 10:33:26 +02:00
max.welz
08fb6ef796 Aufgabe
Benutzername, Name, E-Mail
2020-08-20 10:28:23 +02:00
oliver.stankawitz
53989b2108 Aufgaben gemacht 2020-08-20 10:27:43 +02:00
Simon Liebold
992df519bf Simon hinzugefügt 2020-08-20 10:27:02 +02:00
c36f4befb4 Readme gelöscht 2020-08-20 10:18:51 +02:00
bfacb084e7 Hallo Info LK :) 2020-08-20 10:18:26 +02:00
3674e80178 Ngb eingefügt 2020-08-20 10:16:59 +02:00
Jonas Neugebauer
a833616ed3 Datei für Team-Details hinzugefügt 2020-08-16 14:47:44 +02:00