Merge remote-tracking branch 'origin/jiwon' into ourMaster

764c352c · Kim, Subin · cfcaaab5 · 2e020222 · 764c352c · 764c352c
Commit 764c352c authored Feb 01, 2021 by Kim, Subin
--- a/data/ppt/pc/user-mypage-profile-edit.jpg
+++ b/data/ppt/pc/user-mypage-profile-edit.jpg
--- a/data/ppt/pc/user-mypage-profile-edit2.jpg
+++ b/data/ppt/pc/user-mypage-profile-edit2.jpg
--- a/data/ppt/pc/user-mypage-profile-edit3.jpg
+++ b/data/ppt/pc/user-mypage-profile-edit3.jpg
--- a/data/ppt/pc/user-mypage-profile.jpg
+++ b/data/ppt/pc/user-mypage-profile.jpg
--- a/data/ppt/pc/user-mypage.jpg
+++ b/data/ppt/pc/user-mypage.jpg
--- a/data/ppt/pc/user-outer-product-cart.jpg
+++ b/data/ppt/pc/user-outer-product-cart.jpg
--- a/data/ppt/pc/user-outer-product-description.jpg
+++ b/data/ppt/pc/user-outer-product-description.jpg
--- a/data/ppt/pc/user-outer-product-detailimage.jpg
+++ b/data/ppt/pc/user-outer-product-detailimage.jpg
--- a/data/ppt/pc/user-outer-product-option.jpg
+++ b/data/ppt/pc/user-outer-product-option.jpg
--- a/data/ppt/pc/user-outer-product-recommend.jpg
+++ b/data/ppt/pc/user-outer-product-recommend.jpg
--- a/data/ppt/pc/user-outerList-cardigan.jpg
+++ b/data/ppt/pc/user-outerList-cardigan.jpg
--- a/data/ppt/pc/user-outerList-pagination.jpg
+++ b/data/ppt/pc/user-outerList-pagination.jpg
--- a/data/ppt/pc/user-outerList.jpg
+++ b/data/ppt/pc/user-outerList.jpg
--- a/data/ppt/pc/user-payment-kakaopay1.jpg
+++ b/data/ppt/pc/user-payment-kakaopay1.jpg
--- a/data/ppt/pc/user-payment-kakaopay2.jpg
+++ b/data/ppt/pc/user-payment-kakaopay2.jpg
--- a/data/ppt/pc/user-payment-kakaopay3.jpg
+++ b/data/ppt/pc/user-payment-kakaopay3.jpg
--- a/data/ppt/pc/user-payment-kakaopay4.jpg
+++ b/data/ppt/pc/user-payment-kakaopay4.jpg
--- a/data/ppt/pc/user-payment-postcode.jpg
+++ b/data/ppt/pc/user-payment-postcode.jpg
--- a/data/ppt/pc/user-payment-postcode2.jpg
+++ b/data/ppt/pc/user-payment-postcode2.jpg
--- a/data/ppt/pc/user-payment.jpg
+++ b/data/ppt/pc/user-payment.jpg