Joan Sanchez 90ca883962 solved conflicts		2019-10-08 13:06:50 +02:00
..
index.html	solved conflicts	2019-10-08 13:06:50 +02:00
index.js	merge pull changes	2019-10-08 09:23:29 +02:00
style.scss	merge pull changes	2019-10-08 09:23:29 +02:00