Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta

Browse Source

# Conflicts:
#	locale/pt_BR/LC_MESSAGES/strings.mo
#	locale/pt_BR/LC_MESSAGES/strings.po

...

This commit is contained in:

Marius 2019-12-28 04:07:12 +02:00

parent 3c991e1c2d a67a2ef37e

commit 63789ac74d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available