« Previous | Next » 

Revision 8313c681

ID8313c6817e50e347cf47f7e6b703a7870d262cf0
Parent 57e09fb4, 21a85c0b
Child b2691c21

Added by root almost 9 years ago

Merge branch 'dev' of https://code.grnet.gr/git/pithos into dev

Conflicts:
snf-pithos-app/pithos/api/util.py
snf-pithos-backend/pithos/backends/modular.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted