« Previous | Next » 

Revision a1a73b1b

IDa1a73b1b606f524118df0fcb4924e9af8e6439c3

Added by Kostas Papadimitriou almost 8 years ago

Merge branch 'develop' into feature-floating_ips_ui

Conflicts:
snf-cyclades-app/synnefo/plankton/backend.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted