Commit c4cbc7e

authored and

committed

충돌 수정

1 parent 20c1270 commit c4cbc7eCopy full SHA for c4cbc7e

5 files changed

+953

-959

lines changed

api/src/main/java/org/apache/cloudstack/api
- ApiConstants.java
server/src/main/java/com/cloud/server
- ManagementServerImpl.java
ui
- public/locales
  - en.json
  - ko_KR.json
- src/views/compute
  - InstanceTab.vue

5 files changed

+953

-959

lines changed

Comments

(0)