« Previous | Next » 

Revision 3b120cdd

ID3b120cddc2b05b2b48aaca7b90d6375b0b3bc213

Added by Christos Stavrakakis over 9 years ago

Merge branch 'develop' into debian-develop

Conflicts:
snf-cyclades-app/synnefo/api/management/commands/flavor-create.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted