Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
Conflicts: partials/common/trial_status.html
Showing
25 changed files
with
1126 additions
and
19 deletions
actions/channel/detail/review_hk.html
0 → 100644
actions/channel/detail/review_hk320.html
0 → 100644
actions/channel/detail/trial_hk.html
0 → 100644
actions/channel/detail/trial_hk320.html
0 → 100644
actions/yohood/default/index.html
0 → 100644
actions/yohood/default/index320.html
0 → 100644
actions/yohood/default/index_hk.html
0 → 100644
actions/yohood/default/index_hk320.html
0 → 100644
actions/yohood/default/yohood.html
0 → 100644
partials/common/trial_status_hk.html
0 → 100644
partials/detail/application_form_hk.html
0 → 100644
partials/detail/review_item.html
0 → 100644
partials/detail/review_item320.html
0 → 100644
partials/detail/review_item_hk.html
0 → 100644
partials/detail/review_item_hk320.html
0 → 100644
partials/detail/tooltip_hk.html
0 → 100644
-
Please register or login to post a comment