Olivier Massot e35a052b1c fix merge conflicts 9 mesiacov pred
..
en.json e1623cbe46 fix post upgrade bugs 1 rok pred
fr.json e35a052b1c fix merge conflicts 9 mesiacov pred
fr.json.removed e1623cbe46 fix post upgrade bugs 1 rok pred