mirror of https://github.com/apache/cloudstack.git
Conflicts: ui/index.jsp |
||
|---|---|---|
| .. | ||
| messages.properties | ||
| messages_es.properties | ||
| messages_ja.properties | ||
| messages_zh_CN.properties | ||
Conflicts: ui/index.jsp |
||
|---|---|---|
| .. | ||
| messages.properties | ||
| messages_es.properties | ||
| messages_ja.properties | ||
| messages_zh_CN.properties | ||