Joan Sanchez 768e4d5e77 Resolved conflicts		2022-08-10 12:13:31 +02:00
..
en.json	Resolved conflicts	2022-08-10 12:13:31 +02:00
es.json	Resolved conflicts	2022-08-10 12:13:31 +02:00