« Previous | Next » 

Revision 52468c16

ID52468c166062f9db44ca563b298b291fe7de8926

Added by Christos Stavrakakis about 11 years ago

Merge branch 'devel-0.13' into develop

Conflicts:
snf-cyclades-app/synnefo/api/servers.py
snf-cyclades-app/synnefo/logic/backend.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted