Commit Graph

56 Commits

Author SHA1 Message Date
lars 1694714e10 bug fix ich hasse mich 2019-07-24 13:33:27 +02:00
stockth e8243791cb woooooorrrrrrkkkkkkiinngggggggggg!!!!!!!!!! version(kann nur nicht Rechnen)-;) 2019-07-24 11:50:12 +02:00
stockth a56757a372 Merge remote-tracking branch 'origin/master' 2019-07-24 11:34:13 +02:00
lars 9047a63068 bug wert 2019-07-24 12:38:48 +02:00
tstst334 45332915db Update Klassen.py 2019-07-24 12:35:17 +02:00
komminshotel 3dd7271f8e Merge remote-tracking branch 'origin/master' 2019-07-24 12:27:31 +02:00
komminshotel 97f21101c3 jonnehei 2019-07-24 12:16:07 +02:00
stockth 61c8956ecd t 2019-07-24 11:34:07 +02:00
stockth d8155b03e6 t 2019-07-24 11:03:07 +02:00
stockth 3dceb68eab Bug Fix 2019-07-24 10:41:30 +02:00
lars dadf142c64 pep8 2019-07-24 11:30:32 +02:00
lars c6005fc75b solvable 2019-07-24 11:18:22 +02:00
lars 4a863d00a9 commit 2019-07-24 11:12:58 +02:00
lars ac83ac5b72 bug fix 2019-07-24 10:51:44 +02:00
lars 98475551a7 pep8 2019-07-24 10:50:36 +02:00
naschi b6f39f0b9d Merge remote-tracking branch 'origin/master' 2019-07-24 10:26:46 +02:00
Kommindiewhatsappgruppe 65e6eea62c ggg 2019-07-24 10:24:04 +02:00
TimMcCool 9a059b9eb6 Merge remote-tracking branch 'origin/master' 2019-07-24 12:20:23 +02:00
TimMcCool 46580e6c56 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Klassen.py
2019-07-24 12:20:09 +02:00
stockth 3eaddf72c5 ich hasse python 2019-07-24 11:13:01 +02:00
naschi 97c9e3213b moin 2019-07-24 10:16:56 +02:00
Spongebob-Schwammkopf d7771030b1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Klassen.py
2019-07-24 09:30:35 +02:00
Spongebob-Schwammkopf cf9a680a78 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/misc.xml
2019-07-24 09:26:50 +02:00
stockth 6b3da733c4 t 2019-07-24 09:28:25 +02:00
lars b1da0c3d61 pep8 2019-07-24 10:16:26 +02:00
lars 2a9c583d3d klassen change 2019-07-24 10:05:39 +02:00
lars 4b829a4896 Merge remote-tracking branch 'origin/master' 2019-07-24 09:50:40 +02:00
lars 46d954009a klassen change 2019-07-24 09:50:33 +02:00
korintanra d7f7dd131a rhgdrh 2019-07-24 09:44:20 +02:00
korintanra 518d087fbc Merge remote-tracking branch 'origin/master' 2019-07-24 09:39:08 +02:00
korintanra ddceea5634 rhgdrh 2019-07-24 09:38:58 +02:00
lars b904a05735 klassen change 2019-07-24 09:07:31 +02:00
beyerju cd36677e95 jdsf 2019-07-24 08:39:09 +02:00
LockeDerBoss 727fd1ff04 hey 2019-07-24 10:38:15 +03:00
korintanra d2e115099d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Klassen.py
2019-07-24 10:37:04 +02:00
korintanra 01cc16724a rhgdrh 2019-07-24 10:35:22 +02:00
TimMcCool de46c39a3c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Klassen.py
2019-07-24 10:35:15 +02:00
LockeDerBoss e8165fb63c Merge remote-tracking branch 'origin/master' 2019-07-24 09:38:31 +03:00
TimMcCool 9ee138a69a Merge remote-tracking branch 'origin/master' 2019-07-24 09:36:59 +02:00
TimMcCool 49cb138382 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Klassen.py
2019-07-24 09:36:46 +02:00
TimMcCool 85b927fc52 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Klassen.py
2019-07-24 09:22:50 +02:00
TimMcCool 7902a8dcf2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Klassen.py
2019-07-24 09:22:02 +02:00
TimMcCool c6142bd374 Merge branch 'master' of C:\Users\krometi.SCHULE\PycharmProjects\Projekttage with conflicts. 2019-07-24 09:05:22 +02:00
LockeDerBoss 0671380367 hey 2019-07-24 09:37:33 +03:00
Spongebob-Schwammkopf e2a29fd663 Merge remote-tracking branch 'origin/master' 2019-07-24 08:26:26 +02:00
Spongebob-Schwammkopf 574b8037a6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/misc.xml
2019-07-24 08:26:18 +02:00
Spongebob-Schwammkopf 5c385f7f18 Merge branch 'master' of C:\Users\maternti\PycharmProjects\Projekttage with conflicts. 2019-07-24 08:10:31 +02:00
lars 614e06533c klassen change 2019-07-24 08:01:08 +02:00
lars ff31914235 klassen change 2019-07-24 07:48:43 +02:00
beyerju ac72f0fb0c Merge remote-tracking branch 'origin/master' 2019-07-24 07:29:45 +02:00