« Previous | Next » 

Revision d6b66c2a

IDd6b66c2af88903f83257f86c93e6cb819b40c118
Parent 0069bb38, 59c9711e
Child 8a74cacf

Added by Carlos Martín almost 8 years ago

Merge branch 'master' of git.opennebula.org:one

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted