• Christos Stavrakakis's avatar
    Merge branch 'master' into devel-0.12 · a022973e
    Christos Stavrakakis authored
    Conflicts:
    	snf-cyclades-app/synnefo/api/management/commands/flavor-list.py
    	snf-cyclades-app/synnefo/api/management/commands/server-list.py
    	snf-cyclades-app/synnefo/api/networks.py
    	snf-cyclades-app/synnefo/logic/rapi.py
    a022973e
flavor-list.py 3.26 KB