mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
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