-
Kostas Papadimitriou authored
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
a442e656
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