gaelle morin bc64019b63 update: merge conflict resolved + fixes		2021-01-21 23:54:20 +01:00
..
en.json	update: merge conflict resolved + fixes	2021-01-21 23:54:20 +01:00
es.json	update: merge conflict resolved + fixes	2021-01-21 23:54:20 +01:00
fr.json	update: merge conflict resolved + fixes	2021-01-21 23:54:20 +01:00