Lipu Fei a85f2ce156 Fix merge conflicts

2019-03-26 09:01:01 +01:00

..

resources

Fix merge conflicts with master

2019-03-21 14:59:53 +01:00

src

Fix merge conflicts

2019-03-26 09:01:01 +01:00

tests

Move models around again

2019-03-26 08:29:22 +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