« Previous | Next » 

Revision 93d963c4

ID93d963c40f70483ec20bcf0f17bbc7f5b9af45c0

Added by Sofia Papagiannaki over 8 years ago

Merge branch 'feature-quotas-pithos' into feature-quotas

Conflicts:
snf-cyclades-app/synnefo/plankton/backend.py
snf-pithos-app/README
snf-pithos-app/pithos/api/util.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted