« Previous | Next » 

Revision ab0982ad

IDab0982ad6c707d6cc68bb084bae294de97a12549
Parent 94ca399b, a903e505
Child 52b6f137

Added by Kostas Papadimitriou over 9 years ago

Merge branch 'master' into packaging

Conflicts:
pithos/settings.py
snf-pithos-app/pithos/middleware/log.py
snf-pithos-app/pithos/urls.py
snf-pithos-backend/pithos/backends/__init__.py
snf-pithos-tools/setup.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted