/snf-pithos-app/pithos - Repository - Pithos - Greek Research and Technology Network's projects

| Branch: | Tag: | Revision:

root / snf-pithos-app / pithos @ 4a669c71

#	Date	Author	Comment
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...
4a66acbf	01/31/2012 06:31 pm	Kostas Papadimitriou	Fix items.xml location
02f68bf0	01/27/2012 12:26 pm	Kostas Papadimitriou	Removed prefix for snf-pithos-app - So that snf-webproject serves proper urls
969b4262	01/26/2012 01:24 pm	Kostas Papadimitriou	Merge branch 'master' into packaging Conflicts: pithos/__init__.py
6c8595a5	01/23/2012 06:35 pm	Kostas Papadimitriou	Merge branch 'master' into packaging
9f3278ae	01/23/2012 04:51 pm	Kostas Papadimitriou	Fixed synnefo url format
52b6f137	01/23/2012 03:35 pm	Kostas Papadimitriou	Moved login.py
ab0982ad	01/23/2012 03:34 pm	Kostas Papadimitriou	Merge branch 'master' into packaging 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
f3b8de1a	01/19/2012 03:59 pm	Kostas Papadimitriou	Minor fixes

Also available in: Atom