« Previous | Next » 

Revision 8b9e871d

ID8b9e871d0b08d1d17ce97652a72d72ca648b0f23

Added by Olga Brani over 8 years ago

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
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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted