camellan 41bcc135ff Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta 6 år sedan
..
de 3c991e1c2d - updated all the translations files 6 år sedan
en 3c991e1c2d - updated all the translations files 6 år sedan
es 3c991e1c2d - updated all the translations files 6 år sedan
fr 3c991e1c2d - updated all the translations files 6 år sedan
it 3c991e1c2d - updated all the translations files 6 år sedan
pt_BR ab9db619ee - fix the conflicts 6 år sedan
ro 3c991e1c2d - updated all the translations files 6 år sedan
ru 41bcc135ff Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta 6 år sedan