« Previous | Next » 

Revision e6c4bd78

IDe6c4bd7826d78169e4015efadad292040cd7c68b

Added by Christos Stavrakakis over 8 years ago

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted