mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 20:02:38 +09:00
Conflicts: src/sunstone/public/js/plugins/templates-tab.js src/sunstone/public/js/sunstone.js
Conflicts: src/sunstone/public/js/plugins/templates-tab.js src/sunstone/public/js/sunstone.js