History | View | Annotate | Download (16.4 kB)
Use pithos-backend v0.9.1
Fix merge conflict
Merge remote-tracking branch 'origin/master' into astakos-integration
Conflicts: runtests.sh snf-cyclades-app/synnefo/aai/__init__.py snf-cyclades-app/synnefo/aai/fixtures/auth_test_data.json snf-cyclades-app/synnefo/aai/middleware.py snf-cyclades-app/synnefo/aai/models.py...
Merge branch 'plankton'
Renamed snf-app to snf-cyclades-app