camellan 851c227064 Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta		2019-06-26 01:31:58 +04:00
..
strings.mo	fix conflict	2019-06-26 01:27:43 +04:00
strings.po	Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta	2019-06-26 01:31:58 +04:00