Cura/plugins/VersionUpgrade
Ghostkeeper 20201c65e6
Merge branch 'master' into feature_intent
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
2019-08-13 14:43:28 +02:00
..
2018-12-20 14:01:12 +01:00
2019-08-12 12:22:57 +02:00