# Conflicts:
#	dist/index.html

update: 回退商品至.20

See merge request !146

update: selector.1.2.21

See merge request !145

Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/update-groups-2.25

# Conflicts:
#	dist/index.html

Bugfix

See merge request !144

# Conflicts:
#	dist/index.html
#	dist/static/js/card.45a4020140f7de4a1c02.js
#	dist/static/js/card.4ef7876a56091eba6e6e.js
#	dist/static/js/card.af8b9648e1b47492fbdc.js
#	dist/static/js/manifest.9d5ef98a20a157b36a7d.js

fix: 去除文案

See merge request !142

# Conflicts:
#	dist/index.html
#	dist/static/css/main.717ba8f7380b46594863c7b5d6ae8ea0.css
#	dist/static/css/main.ef6fda33a6e1e1e070617f3d313b2abc.css
#	dist/static/css/main.f7c05bd3d2a9602b8d6de0b55ae8c739.css
#	dist/static/js/card.1fea1a674b8dc6623177.js
#	dist/static/js/card.45a4020140f7de4a1c02.js
#	dist/static/js/card.70ad8bb1f97300d196ba.js
#	dist/static/js/manifest.83694b2d0e147740e649.js