Ghostkeeper 232498980c Merge branch '4.0' ... Conflicts: cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered. plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.		2019-01-28 16:45:45 +01:00
..
resources	Merge pull request #5216 from Ultimaker/CL-1188_hide_print_job_on_unavailable_printer	2019-01-28 11:08:21 +01:00
src	Merge branch '4.0'	2019-01-28 16:45:45 +01:00
tests	Revert "Added skip mark to failing cloud tests"	2019-01-17 14:43:43 +01:00
__init__.py	Use BaseModel for CloudCluster, some fixes	2018-11-26 14:51:24 +01:00
plugin.json	Update plugin versions to match package versions	2018-12-17 13:03:21 +01:00