-
订单详情页优化 # Conflicts: # static/js/common.js # static/js/me/order-detail.js # static/sass/me/_order-detail.css # template/m.yohobuy.com/actions/guang/info/index.phtml # template/m.yohobuy.com/actions/guang/starclass/collocation-list.phtml # template/m.yohobuy.com/actions/guang/starclass/index.phtml # template/m.yohobuy.com/actions/guang/starclass/subject.phtml # template/m.yohobuy.com/actions/index/home/order-detail.phtml # template/m.yohobuy.com/actions/index/search/index.phtml # template/m.yohobuy.com/actions/product/index/category.phtml # template/m.yohobuy.com/actions/product/index/shop.phtml # template/m.yohobuy.com/partials/filter.phtml # template/m.yohobuy.com/partials/good.phtml # template/m.yohobuy.com/partials/guang/banner-top.phtml # template/m.yohobuy.com/partials/guang/head-tab.phtml # template/m.yohobuy.com/partials/guang/home-floor-collocation.phtml # template/m.yohobuy.com/partials/guang/home-floor-subject.phtml # template/m.yohobuy.com/partials/home/banner_top.phtml # template/m.yohobuy.com/partials/home/hot_category.phtml # template/m.yohobuy.com/partials/layout/page_header.phtml # template/m.yohobuy.com/partials/product/goods-nav-top.phtml # template/m.yohobuy.com/partials/product/shop-footer.phtml
-
# Conflicts: # static/js/common.js
-
…to feature/branchOptmztn # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
