Olivier Massot 949bc3fdb9 fix merge conflicts 4 mesiacov pred
..
fr 949bc3fdb9 fix merge conflicts 4 mesiacov pred
en.json e1623cbe46 fix post upgrade bugs 1 rok pred
fr.json.removed e1623cbe46 fix post upgrade bugs 1 rok pred