Further improvents to branding settings
Merge remote-tracking branch 'origin/develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/templates/im/footer.html snf-cyclades-app/setup.py
Merge branch 'feature-snf-django' into develop
Conflicts: docs/older/Changelog.pithos-app snf-astakos-app/astakos/im/api/__init__.py snf-pithos-app/pithos/api/util.py
Merge branch 'release-0.13' into develop
Conflicts: snf-astakos-app/astakos/im/messages.py
Fix create vm view images filtering in cyclades ui
use the new synnefo.user method `get_username` to populatepersonal/shared images.
Move astakos lib from snf-common to snf-django-lib
Merge branch 'feature-branding' of https://code.grnet.gr/git/synnefo into feature-branding
Merge branch 'develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/settings.py snf-astakos-app/astakos/im/templates/im/login_base.html snf-astakos-app/astakos/im/templatetags/astakos_tags.py snf-cyclades-app/synnefo/app_settings/default/ui.py...
Conflicts: snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/views.py version
Remove ui debug statement
View revisions
Also available in: Atom