mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-18 19:02:53 +09:00
Conflicts: src/sunstone/public/js/plugins/marketplace-tab.js src/sunstone/public/js/plugins/vms-tab.js src/tm/TransferManager.cc
Conflicts: src/sunstone/public/js/plugins/marketplace-tab.js src/sunstone/public/js/plugins/vms-tab.js src/tm/TransferManager.cc