Daniel Schiavini a1c252d3a2 Revert "Revert "fix merge conflict"" ... This reverts commit 4bffa6d90f.		2018-12-07 10:25:46 +01:00
..
resources	Revert "Revert "fix merge conflict""	2018-12-07 10:25:46 +01:00
src	Revert "Revert "fix merge conflict""	2018-12-07 10:25:46 +01:00
tests	STAR-322: Extracting models to be able for converting themselves	2018-12-05 14:08:40 +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