Commit e99318c8 authored by Christos Stavrakakis's avatar Christos Stavrakakis
Browse files

Merge branch 'release-0.13' into develop

Conflicts:
	snf-cyclades-app/synnefo/api/management/commands/cyclades-export-quota.py
	snf-cyclades-app/synnefo/api/management/commands/network-list.py
	snf-cyclades-app/synnefo/api/management/commands/server-inspect.py
	snf-cyclades-app/synnefo/api/management/commands/server-list.py
	snf-cyclades-app/synnefo/logic/management/commands/network-inspect.py
	version
parents 62b71f87 7b922cf7
......@@ -5,7 +5,6 @@ PROJECTS="\
snf-pithos-backend\
snf-cyclades-gtools\
snf-cyclades-app\
snf-pithos-tools\
snf-pithos-app\
snf-quotaholder-app\
snf-tools"
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