• Christos Stavrakakis's avatar
    Merge branch 'release-0.13' into develop · e99318c8
    Christos Stavrakakis authored
    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
    e99318c8
cyclades-export-quota.py 2.88 KB