-
Olga Brani authored
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 snf-astakos-app/astakos/synnefo_settings.py snf-cyclades-app/synnefo/app_settings/default/api.py snf-cyclades-app/synnefo/app_settings/default/cloudbar.py snf-cyclades-app/synnefo/ui/views.py
7e03df0a