« Previous | Next » 

Revision c2337e25

IDc2337e2509b8c27ca8ccb78b86371877c5320752

Added by Kostas Papadimitriou about 8 years ago

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
snf-cyclades-app/synnefo/ui/static/snf/images/okeanos-logo-alpha.png
snf-cyclades-app/synnefo/ui/templates/footer.html
snf-cyclades-app/synnefo/ui/templates/home.html
snf-cyclades-app/synnefo/ui/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted