Commit c0b0844d authored by Daniele Venzano's avatar Daniele Venzano
Browse files

Merge remote-tracking branch 'origin/devel/master' into devel/master

Conflicts:
	zoe_master/backends/service_instance.py
parents feb01ba9 0c55d26b
Pipeline #10084 passed with stages
in 2 minutes and 39 seconds