« Previous | Next » 

Revision 11976ee3

ID11976ee3c288640de70cd5209ad6c061e5079405
Parent ecd1058e, 27cfa807
Child 630911ee

Added by Kostas Papadimitriou almost 12 years ago

Merge branch 'devel-0.11' into ui-0.11

Conflicts:
snf-common/synnefo/lib/astakos.py
snf-cyclades-app/synnefo/ui/static/snf/js/models.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted