Group create summary page static
- Help_text for group create form- Resource_presentation dict
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Merge billing
Merged demo
Radio button fixesBug fixes
Merge branch 'future' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py snf-astakos-app/astakos/im/api/spec.py snf-astakos-app/astakos/im/endpoints/quotaholder.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py...
Merge with future branch
Merge branch '0.6.4' into future
Conflicts: snf-astakos-app/astakos/im/synnefo_settings.py
View revisions
Also available in: Atom