Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta
# Conflicts: # locale/pt_BR/LC_MESSAGES/strings.mo # locale/pt_BR/LC_MESSAGES/strings.po
This commit is contained in:
commit
63789ac74d
# Conflicts: # locale/pt_BR/LC_MESSAGES/strings.mo # locale/pt_BR/LC_MESSAGES/strings.po