« Previous | Next » 

Revision 630911ee

ID630911ee2a399cf1dd0f07a1104a9529af97d14b
Parent 11976ee3, 1dc12b52
Child b16db49b

Added by Kostas Papadimitriou over 11 years ago

Merge branch 'progress-monitor-new' into ui-0.11

Conflicts:
snf-cyclades-app/synnefo/ui/static/snf/js/models.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted