mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 03:42:52 +09:00
Conflicts: src/sunstone/public/js/plugins/templates-tab.js src/vmm_mad/remotes/vcenter/vcenter_driver.rb
Conflicts: src/sunstone/public/js/plugins/templates-tab.js src/vmm_mad/remotes/vcenter/vcenter_driver.rb