mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
Conflicts: client/WEB-INF/classes/resources/messages.properties ui/scripts/cloudStack.js ui/scripts/instanceWizard.js
Conflicts: client/WEB-INF/classes/resources/messages.properties ui/scripts/cloudStack.js ui/scripts/instanceWizard.js