ued / yohogirls-frontend · Commits

Conflicts:
	web/js/util/seajs.js
	web/package.json

调试冲突
Conflicts:
	web/package.json

Conflicts:
	web/js/public.js

冲突调试
Conflicts:
	web/js/public.js
	web/package.json

Conflicts:
	web/index.js
	web/js/public.js
	web/package.json

Conflicts:
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_1620_about.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_1620_detail.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_1620_home.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_1620_magazine.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_768_about.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_768_detail.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_768_magazine.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_whatever_about.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_whatever_detail.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_whatever_home.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_whatever_magazine.scssc
	web/.sass-cache/d58ea7ac3321b7c36c11474af44a2cc9db4a3159/_whatever_other.scssc
	web/.sass-cache/f1b45aa02c609288878829d1e62f0b83c178707d/idangerous.swiper.scssc
	web/js/public.js
	web/sass/scss/media/_768_about.scss
	web/sass/scss/media/_768_magazine.scss
	web/sass/scss/media/_whatever_magazine.scss

4-24代码提交
Conflicts:
	web/.sass-cache/bf6f5af5336c458f0990ca748a66f8b030cc4417/_whatever_magazine.scssc

detail 及rotate2d插件修改
Conflicts:
	web/js/channel/detail.js
	web/js/plugin/comment.js

冲突修改
Conflicts:
	web/js/public.js
	web/package.json

Conflicts:
	web/.sass-cache/bf6f5af5336c458f0990ca748a66f8b030cc4417/_1620_detail.scssc
	web/.sass-cache/bf6f5af5336c458f0990ca748a66f8b030cc4417/_768_detail.scssc
	web/.sass-cache/bf6f5af5336c458f0990ca748a66f8b030cc4417/_whatever_detail.scssc
	web/js/channel.js
	web/js/channel/detail.js
	web/js/channel/magazine.js
	web/js/plugin/comment.js
	web/package.json
	web/sass/scss/media/_1620_magazine.scss
	web/sass/scss/media/_768_about.scss
	web/sass/scss/media/_768_detail.scss
	web/sass/scss/media/_768_magazine.scss
	web/sass/scss/media/_whatever_magazine.scss

Conflicts:
	web/package.json

合并imgzoom插件到develop
Conflicts:
	web/package.json