develop #2

Merged
swarga merged 10 commits from develop into master 2020-12-25 04:59:51 +01:00

10 Commits

Author SHA1 Message Date
a376653f27 Resolved merge issues 2020-12-25 04:59:32 +01:00
Paulina Nowak
17ebde7fab asaaaaas 2020-12-25 04:45:14 +01:00
Paulina Nowak
b8dcadbeb3 asasa 2020-12-25 04:20:54 +01:00
Paulina Nowak
24213bb713 dsds 2020-12-24 06:27:20 +01:00
Paulina Nowak
a3ad4bf7ac sdsd 2020-12-24 06:10:53 +01:00
Paulina Nowak
24601be13c ffss 2020-12-24 00:39:08 +01:00
Paulina Nowak
d6ce3d2579 dupa 2020-12-24 00:33:54 +01:00
Paulina Nowak
a38a3a3d3d dsds 2020-12-23 23:37:04 +01:00
Paulina Nowak
b7b599e295 :3 2020-12-23 21:46:09 +01:00
Paulina Nowak
71d34178f0 DZIALA 2020-12-23 21:00:38 +01:00