« Previous | Next » 

Revision a30aa32c

IDa30aa32cfa1cfa3216f2ffbabf2b4c371a2832d5

Added by Vangelis Koukis almost 11 years ago

Merge branch 'ui-0.5'

Conflicts:
invitations/templates/invitations.html
ui/static/ie.css
ui/static/main.css
ui/static/synnefo.js
ui/templates/feedback_mail.txt
ui/templates/home.html

Files

  • added
  • modified
  • copied
  • renamed
  • deleted