Statistics
| Branch: | Tag: | Revision:

root / snf-pithos-app / pithos / api / synnefo_settings.py @ ccfd4e44

History | View | Annotate | Download (369 Bytes)

# Date Author Comment
b2d77f0e 02/23/2012 03:33 pm Kostas Papadimitriou

Updated snf-webproject hooks

4a669c71 02/22/2012 01:45 pm Kostas Papadimitriou

Fixed additional conflicts from previous merge

88353602 02/22/2012 12:36 pm Kostas Papadimitriou

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...