Merge branch 'master' of s434190/DWIN1000 into master

This commit is contained in:
Michał Goliński 2019-01-18 10:01:00 +00:00 committed by Gogs
commit 2565f5a63c

View File

@ -1 +1,6 @@
1. Spaczyński Jonathan
<<<<<<< HEAD
1.Łukaszewska Kamilla
2. Spaczyński Jonathan
=======
2. Spaczyński Jonathan
>>>>>>> 6a446033bc107e20e24bf3cb0ae5b6eda580b826