« Previous | Next » 

Revision 1d734889

ID1d7348895347e64b734b60643f4a87b848a3fb77
Parent f8d1eaf4, e49565e1
Child 1dc12b52

Added by Kostas Papadimitriou over 11 years ago

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

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted