« Previous | Next » 

Revision 3f77e63d

ID3f77e63d44232bc1a09d17a05b5e7282bb0f7843

Added by Christos Stavrakakis over 9 years ago

Merge branch 'master' into devel-0.13

Conflicts:
snf-cyclades-app/synnefo/db/models.py
snf-cyclades-app/synnefo/logic/management/commands/backend-modify.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted