gaelle morin 84e3383aac patch: conflict resolved		2021-04-01 14:13:02 +02:00
..
en.json	patch: conflict resolved	2021-04-01 14:13:02 +02:00
es.json	patch: conflict resolved	2021-04-01 14:13:02 +02:00
fr.json	patch: conflict resolved	2021-04-01 14:13:02 +02:00