mirror of https://github.com/apache/cloudstack.git
Conflicts: client/WEB-INF/classes/resources/messages_de_DE.properties |
||
|---|---|---|
| .. | ||
| baremetal | ||
| kvm | ||
| ovm | ||
| simulator | ||
| ucs | ||
| vmware | ||
| xen | ||
Conflicts: client/WEB-INF/classes/resources/messages_de_DE.properties |
||
|---|---|---|
| .. | ||
| baremetal | ||
| kvm | ||
| ovm | ||
| simulator | ||
| ucs | ||
| vmware | ||
| xen | ||