Merge branch 'master' into feature_sync_button

Browse source

...

This commit is contained in:

Diego Prado Gesto 2018-03-06 10:24:11 +01:00

parent 731a1092c5 3e8f29d380

commit 13e18c9d54

568 changed files with 6406 additions and 6604 deletions

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

Download patch file Download diff file Expand all files Collapse all files

1179

cura/Settings/MachineManager.py

View file

File diff suppressed because it is too large Load diff