1
0
forked from tdwojak/Python2017
Commit Graph

11 Commits

Author SHA1 Message Date
27d6fb7c7b Merge branch 'master' of https://git.wmi.amu.edu.pl/tdwojak/Python2017
# Conflicts:
#	labs02/test_task.py
2017-12-02 15:44:04 +01:00
881ce4306e Merge branch 'master' of https://git.wmi.amu.edu.pl/tdwojak/Python2017
# Conflicts:
#	labs02/test_task.py
2017-12-02 15:43:33 +01:00
dcd13d8f6d Merge branch 'master' of https://git.wmi.amu.edu.pl/tdwojak/Python2017
# Conflicts:
#	labs02/test_task.py
2017-12-02 15:35:28 +01:00
4a20298ab2 Merge branch 'master' of https://git.wmi.amu.edu.pl/tdwojak/Python2017
# Conflicts:
#	labs02/test_task.py
2017-12-02 15:35:13 +01:00
8eda90d9f8 Merge branch 'master' of https://git.wmi.amu.edu.pl/tdwojak/Python2017
# Conflicts:
#	labs02/test_task.py
2017-12-02 15:33:48 +01:00
ac68c51136 Merge branch 'master' of https://git.wmi.amu.edu.pl/tdwojak/Python2017
# Conflicts:
#	labs02/test_task.py
2017-12-02 15:28:53 +01:00
5fbc3b57d4 Merge branch 'master' of https://git.wmi.amu.edu.pl/tdwojak/Python2017
# Conflicts:
#	labs02/test_task.py
2017-12-02 15:28:00 +01:00
505e2aa30c Merge branch 'master' of https://git.wmi.amu.edu.pl/tdwojak/Python2017
# Conflicts:
#	labs02/test_task.py
2017-12-02 15:26:26 +01:00
feac488751 Fix wyklad 2017-12-02 12:43:05 +01:00
135d01c0d7 Add scores 2017-12-02 12:10:44 +01:00
d311b94e01 Add labs3 2017-12-02 12:10:31 +01:00