History | View | Annotate | Download (369 Bytes)
Updated snf-webproject hooks
Fixed additional conflicts from previous merge
Merge commit 'v0.9.0' into packaging
Conflicts: pithos/__init__.py pithos/api/management/commands/__init__.py pithos/backends/lib/rabbitmq/__init__.py pithos/backends/lib/rabbitmq/queue.py pithos/lib/user.py pithos/middleware/user.py pithos/settings.py...