Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'master' of https://github.com/yincart/basic

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

Signed-off-by: Chaozhang Xue <475990465@qq.com>