# 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

fix: build bug

See merge request !141

# Conflicts:
#	dist/index.html

# Conflicts:
#	dist/index.html
#	dist/static/css/main.717ba8f7380b46594863c7b5d6ae8ea0.css
#	dist/static/css/main.7b83551d2d836baf07258d5baaf8791a.css
#	dist/static/css/main.ff54dbdec47bda1975156de72cd16c0f.css

fix: 转赠图尺寸调整 by ui

See merge request !140

fix: bug + 文案

See merge request !139

# Conflicts:
#	dist/index.html
#	dist/static/css/main.7b83551d2d836baf07258d5baaf8791a.css
#	dist/static/css/main.ab04aae490ebd0b8071d0709fb56a75a.css
#	dist/static/css/main.f6db7ce0259baafcbaf1248b6bdeb07d.css
#	dist/static/js/manifest.da2c584588724cecfe2c.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.7b50cfd5aa01b6792fa833c51c86a8eb.css
#	dist/static/css/main.f678d87e384011ccefcb59ca5b247816.css
#	dist/static/css/main.f6db7ce0259baafcbaf1248b6bdeb07d.css
#	dist/static/js/manifest.276f2ac0191a99fa0e73.js
#	dist/static/js/manifest.53f1c76eb811db84e68d.js
#	dist/static/js/manifest.87c6714c74b0f26564de.js

fix: 文案调整

See merge request !138

Release

See merge request !137

# Conflicts:
#	dist/index.html
#	dist/static/css/main.4fa83a75c94e30d8a1f0860c6de52153.css
#	dist/static/css/main.7c09bdebb40bac3b29ecee2bb7a7f883.css
#	dist/static/css/main.f678d87e384011ccefcb59ca5b247816.css
#	dist/static/js/manifest.87c6714c74b0f26564de.js

# Conflicts:
#	dist/index.html
#	dist/static/js/manifest.d4016a40f31904facb01.js

# Conflicts:
#	dist/index.html
#	dist/static/css/main.0855bbcbb3603daf70f579581537bb18.css
#	dist/static/css/main.4fa83a75c94e30d8a1f0860c6de52153.css
#	dist/static/css/main.5ac3df22a6db65b87857830927d3012c.css