Revision 21a85c0b
ID | 21a85c0b14f4c82a657f406f870e0aafe582a6d7 |
Merge branch 'dev' of https://code.grnet.gr/git/pithos into dev
Conflicts:
snf-pithos-app/pithos/api/dispatch.py
snf-pithos-app/pithos/api/management/commands/storagequota.py
snf-pithos-app/pithos/api/util.py
snf-pithos-backend/pithos/backends/modular.py
Files
- added
- modified
- copied
- renamed
- deleted