lars
|
15295d92ad
|
main change names
|
2019-08-02 14:06:58 +02:00 |
|
lars
|
7297dcae59
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# main.py
|
2019-08-02 13:47:00 +02:00 |
|
lars
|
06b364eb4a
|
Merge remote-tracking branch 'origin/master'
|
2019-07-31 19:59:13 +02:00 |
|
lars
|
b8aef9ed66
|
Merge branch 'master' of /home/lars/PycharmProjects/grade-program with conflicts.
|
2019-07-31 19:59:11 +02:00 |
|