-
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
-
Conflicts: web/gulpfile.js web/js/channel.js web/js/public.js web/js/util/seajs.js web/package.json web/sass/scss/plugin/idangerous.swiper.scss
-
04-22 17:30 Conflicts: web/.sass-cache/d6bd5b1d5e4a3dac7860662e94fe536e29fb85cb/idangerous.swiper.scssc
-
Conflicts: mobile/config.rb mobile/sass/base/_mixins.scss mobile/sass/base/_sprite.scss mobile/sass/base/_variable.scss mobile/sass/mobile.scss mobile/sass/partial/_404.scss mobile/sass/partial/_about.scss mobile/sass/partial/_detail.scss mobile/sass/partial/_edit.scss mobile/sass/partial/_index.scss mobile/sass/partial/_magazine.scss mobile/sass/partial/_map.scss mobile/sass/partial/_other.scss mobile/sass/partial/_public.scss mobile/sass/partial/_video.scss mobile/sass/partial/components/_comment.scss mobile/sass/partial/components/_download-app.scss mobile/sass/partial/components/_footer.scss mobile/sass/partial/components/_header-download-app.scss mobile/sass/partial/components/_header-nav.scss mobile/sass/partial/components/_header.scss mobile/sass/partial/components/_links.scss mobile/sass/partial/components/_login.scss mobile/sass/partial/components/_page_switch.scss mobile/sass/partial/components/_search.scss mobile/sass/partial/components/_side-bar.scss mobile/sass/partial/components/_tag.scss mobile/sass/partial/plugin/_idangerous.swiper.scss web/assets/images/followusbackground.png web/assets/images/logo.png web/assets/images/pager_choosen.png web/gulpfile.js web/sass/scss/_common.scss web/sass/scss/girls.scss web/sass/scss/media/_1620_home.scss web/sass/scss/media/_whatever_home.scss web/sass/scss/plugin/idangerous.swiper.scss