« Previous | Next » 

Revision 585c214a

ID585c214af33a97d2655aaef41e0643f1f1155999
Parent f2c104bb, 603f0448
Child be58d031

Added by Tino Vázquez about 8 years ago

Merge branch 'feature-1664' of git.opennebula.org:one into feature-1664

Conflicts:
src/sunstone/public/js/plugins/datastores-tab.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted