History | View | Annotate | Download (3.3 kB)
Merge branch 'develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js snf-astakos-app/astakos/im/templates/im/base.html snf-astakos-app/astakos/im/templates/im/landing.html snf-astakos-app/astakos/im/views.py...
Revert quotaholder's name to quotaholder_app
In order to facilitate migrations.
Move astakos webproject hooks
move astakos.im.synnefo_settings to astakos.synnefo_settings and makethe appropriate changes in setup.py