History | View | Annotate | Download (9 kB)
Remove conflict fbafile.py
Merge branch 'dev' of https://code.grnet.gr/git/pithos into latest-quota
Conflicts: .gitignore devtools/fabfile.py snf-pithos-app/pithos/api/util.py
Move fabfile under devtools/