fe / yohobuy-node · Commits

# Conflicts:
#	apps/home/controllers/QRcode.js
#	apps/home/models/qrcode.js
#	apps/home/router.js
#	doraemon/views/partial/header.hbs
#	public/js/home/QRcode.page.js
#	public/scss/home/_index.css