djqiang branch
add rails in script
Merge branch 'master' of github.com:13-Web-117/depot
add User seed
add User seed
add welcome
merge
Merge branch 'lin_branch'
Merge branch 'lin_branch'
Merge branch 'lin_branch'
add chinese language
Merge branch 'master' of github.com:13-Web-117/depot
Merge branch 'lin_branch'
add chinese language
Back to top button and cart animate
Merge branch 'master' of https://github.com/13-Web-117/depot
add chinese language for admin
Merge branch 'master' of https://github.com/13-Web-117/depot
jp
Merge branch 'master' of https://github.com/13-Web-117/depot