Commit c0b0844d authored by Daniele Venzano's avatar Daniele Venzano

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

Conflicts:
	zoe_master/backends/service_instance.py
parents feb01ba9 0c55d26b
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment