« Previous | Next » 

Revision 29c0a059

ID29c0a0594864580598e69026186438fd3adaef83
Parent 034f6ab8, 64f0b613
Child 7724a1c8

Added by Carlos Martín over 5 years ago

Merge remote-tracking branch 'origin/feature-3987'

Conflicts:
src/sunstone/public/app/utils/disks-resize.js
src/sunstone/public/app/utils/vcenter/networks.js
src/sunstone/public/app/utils/vcenter/templates.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted