Merge branch 'Beta' of https://bitbucket.org/cmsteinBR/flatcam into Beta

Browse Source

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

...

This commit is contained in:

cmsteinBR 2019-07-31 08:34:12 -03:00

parent fa8c66cdc4 2c13756714

commit f5300d9e9c

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