GitHub PushEvent at 2014-10-14 02:37:48
Repository: vt
Actor: daizhiyu
Payload: {"shas":[["4c88cd0edbb829649eec35e58b9d02443ad41299","65ad6343e4c138d7ddd68df14db8e1337e7b69c5@qq.com","\tmodified:   app/.DS_Store\n\tmodified:   app/assets/stylesheets/tradev.css\n\tmodified:   app/controllers/.DS_Store\n\tmodified:   app/controllers/admin/static_pages_controller.rb\n\tmodified:   app/controllers/admin/suppliers_controller.rb\n\tmodified:   app/controllers/application_controller.rb\n\tmodified:   app/controllers/pages_controller.rb\n\tmodified:   app/controllers/patch/member_addrs_controller.rb\n\tmodified:   app/controllers/store/cats_controller.rb\n\tmodified:   app/controllers/store/goods_controller.rb\n\tmodified:   app/controllers/store/orders_controller.rb\n\tmodified:   app/controllers/tairyo_controller.rb\n\tmodified:   app/controllers/vshop_controller.rb\n\tmodified:   app/decorators/controllers/weixin_rails_middleware/weixin_controller_decorator.rb\n\tmodified:   app/helpers/application_helper.rb\n\tmodified:   app/models/ecstore/account.rb\n\tmodified:   app/models/ecstore/manager.rb\n\tmodified:   app/views/admin/suppliers/index.html.erb\n\tmodified:   app/views/commissions/bank_info.html.erb\n\tmodified:   app/views/layouts/tairyo.html.erb\n\tmodified:   app/views/layouts/tairyo_new.html.erb\n\tmodified:   app/views/layouts/tradev.html.erb\n\tmodified:   app/views/patch/member_addrs/_form.html.erb\n\tmodified:   app/views/patch/member_addrs/_form_mobile.html.erb\n\tmodified:   app/views/patch/member_addrs/edit.html.erb\n\tmodified:   app/views/patch/member_addrs/index.html.erb\n\tmodified:   app/views/patch/member_addrs/new_memberaddr_add.html.erb\n\tmodified:   app/views/store/cart/mobile.html.erb\n\tmodified:   app/views/store/cats/show_mobile.html.erb\n\tmodified:   app/views/store/goods/mproduct.html.erb\n\tdeleted:    app/views/store/orders/black_manco.erb\n\tmodified:   app/views/store/orders/index_mobile.html.erb\n\tmodified:   app/views/store/orders/mobile_show.html.erb\n\tnew file:   app/views/store/orders/mobile_show_order.html.erb\n\tmodified:   app/views/store/orders/new_mobile.html.erb\n\tmodified:   app/views/store/orders/new_mobile_addr.html.erb\n\tdeleted:    app/views/store/orders/norsh_show_order.html.erb\n\tmodified:   app/views/store/orders/share.html.erb\n\tmodified:   app/views/tairyo/index.html.erb\n\tmodified:   app/views/users/create.js.erb\n\tmodified:   app/views/vshop/user.html.erb\n\tmodified:   config/application.rb\n\tnew file:   config/initializers/i18n.rb\n\tmodified:   config/locales/en.yml\n\tmodified:   config/locales/zh_cn.yml\n\tmodified:   config/routes.rb","daizhiyu",true],["e57885e238e916307805d4d1d8e31dd683174974","65ad6343e4c138d7ddd68df14db8e1337e7b69c5@qq.com","Merge branch 'master' of https://github.com/jason0037/vt\n\nConflicts:\n\tapp/controllers/vshop_controller.rb\n\tapp/views/store/cart/mobile.html.erb","daizhiyu",true]],"size":2,"ref":"refs/heads/master","head":"e57885e238e916307805d4d1d8e31dd683174974"}