« Previous | Next » 

Revision 2a6bc845

ID2a6bc8453be1bc58150ec94003a013bb0280919c
Parent 6f286280, 16ecca66
Child dc0c1799

Added by Ruben S. Montero about 9 years ago

Merge remote-tracking branch 'hector/feature-1268' into feature-1268

Conflicts:
src/sunstone/public/js/opennebula.js
src/sunstone/public/locale/fr_FR/fr_FR.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted