mirror of https://github.com/apache/cloudstack.git
Conflicts: client/WEB-INF/classes/resources/messages.properties ui/css/cloudstack3.css reviewed-by: brian |
||
|---|---|---|
| .. | ||
| classes/resources | ||
| web.xml | ||
Conflicts: client/WEB-INF/classes/resources/messages.properties ui/css/cloudstack3.css reviewed-by: brian |
||
|---|---|---|
| .. | ||
| classes/resources | ||
| web.xml | ||