Merge branch 'ENV-STAGING' into 'ENV-DEV'
# Conflicts: # src/container/MasterData/ReportItems/CreateReportItems.js # src/container/MasterData/ReportItems/EditReportItems.js
Showing
| { | ||
| "name": "my-app", | ||
| "version": "0.1.0", | ||
| "homepage": "http://localhost:8080/web/", | ||
| "homepage": "http://localhost:8080/web-staging/", | ||
| "private": true, | ||
| "dependencies": { | ||
| "@date-io/date-fns": "^1.3.13", | ||
| ... | ... |
Please register or sign in to comment