« Previous | Next » 

Revision 88353602

ID883536025464cbae9aa12ae97cf20706e8ef8bc5
Parent fa36b326, afb8520d
Child f388beb9

Added by Kostas Papadimitriou about 9 years ago

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
pithos/ui/__init__.py
pithos/ui/urls.py
pithos/ui/views.py
snf-pithos-app/pithos/api/settings.py
snf-pithos-app/pithos/middleware/log.py
snf-pithos-app/pithos/middleware/user.py
snf-pithos-app/pithos/ui/settings.py
snf-pithos-app/pithos/ui/templates/feedback_mail.txt
snf-pithos-app/pithos/ui/views.py
snf-pithos-lib/pithos/lib/__init__.py
snf-pithos-tools/pithos/__init__.py
snf-pithos-tools/pithos/tools/dispatcher.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted