Olivier Massot e35a052b1c fix merge conflicts 8 maanden geleden
..
en.json e1623cbe46 fix post upgrade bugs 11 maanden geleden
fr.json e35a052b1c fix merge conflicts 8 maanden geleden
fr.json.removed e1623cbe46 fix post upgrade bugs 11 maanden geleden