« Previous | Next » 

Revision 1e342487

ID1e342487be26c1b88b7a977f8b57cba35150ef8d
Parent d5584f5a, 31274272
Child 0cbff482

Added by Hector Sanjuan about 10 years ago

Merge branch 'feature-507' of opennebula.org:one-ui into feature-507

Conflicts:
src/sunstone/public/js/plugins/vms-tab.js
src/sunstone/public/js/plugins/vnets-tab.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted