Revision 2cee1378
ID | 2cee13781c57cf45cafca99a66f20112fad8b29a |
Merge branch 'master' into debian-0.8
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