Commit Graph

149 Commits

Author SHA1 Message Date
michelar bf5282fcb6 ruweigfiwgfihuidfsp98uf 2019-07-24 10:22:37 +02:00
Kommindiewhatsappgruppe 98a0b15383 Merge remote-tracking branch 'origin/master' 2019-07-24 09:19:26 +02:00
lars d56069ff64 Merge remote-tracking branch 'origin/master' 2019-07-24 11:18: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
stockth 9f364deeb2 t 2019-07-24 10:09:10 +02:00
stockth 762fc075af Merge remote-tracking branch 'origin/master' 2019-07-24 10:08:30 +02:00
stockth 3789d9ec2f t 2019-07-24 10:08:21 +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 8508cb90af pep8 2019-07-24 10:12:41 +02:00
Kommindiewhatsappgruppe 50f8d199d1 ggg 2019-07-24 09:19:15 +02:00
stockth 4b53bb3b51 Merge remote-tracking branch 'origin/master' 2019-07-24 09:04:16 +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 e99c98a1c9 Merge remote-tracking branch 'origin/master' 2019-07-24 09:07:38 +02:00
lars b904a05735 klassen change 2019-07-24 09:07:31 +02:00
stockth e873aa0d83 t 2019-07-24 09:04:04 +02:00
TimMcCool de1733b3a1 Merge remote-tracking branch 'origin/master' 2019-07-24 09:37:06 +02: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
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
LockeDerBoss 0671380367 hey 2019-07-24 09:37:33 +03:00
stockth e25a95a6f8 Merge remote-tracking branch 'origin/master' 2019-07-24 08:31:24 +02:00
stockth 90e7a7908e t 2019-07-24 08:31:07 +02: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 3305222e93 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/misc.xml
2019-07-24 08:14:36 +02:00
Spongebob-Schwammkopf 5c385f7f18 Merge branch 'master' of C:\Users\maternti\PycharmProjects\Projekttage with conflicts. 2019-07-24 08:10:31 +02:00
LockeDerBoss 1219a4f697 Merge remote-tracking branch 'origin/master' 2019-07-24 09:09:09 +03:00
LockeDerBoss 96501ead6f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml
#	Uebungen/test.txt
2019-07-24 09:09:05 +03:00
lars 6a08cca9e8 Merge remote-tracking branch 'origin/master' 2019-07-24 08:01:25 +02:00
lars 614e06533c klassen change 2019-07-24 08:01:08 +02:00
Spongebob-Schwammkopf 5060d189ab Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/misc.xml
2019-07-24 07:58:47 +02:00