Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' into jingye
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'chenyu'
Merge branch 'master' of https://github.com/yincart/basic
Merge branch 'jingye'

Conflicts:
	themes/leather/views/cart/index.php
	themes/leather/views/catalog/index.php