Marijn Deé 74028c4fa1 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection		2018-12-07 16:21:38 +01:00
..
resources	Revert "Revert "fix merge conflict""	2018-12-07 10:25:46 +01:00
src	STAR-322: Checking if response changed before updating cluster	2018-12-07 13:19:45 +01:00
tests	First test for CloudDevices	2018-12-07 16:21:08 +01:00
__init__.py	Use BaseModel for CloudCluster, some fixes	2018-11-26 14:51:24 +01:00
plugin.json	Increase plugin API version to 5	2018-08-27 13:59:00 +02:00