deploy.rb
2.18 KB
-
Merge remote-tracking branch 'origin/vietth_feat_order_management' into deploy_mina · 65a31567
Conflicts: Gemfile Gemfile.lock app/views/layouts/_header.html.haml db/schema.rb
Tran Hoang Viet committed
Conflicts: Gemfile Gemfile.lock app/views/layouts/_header.html.haml db/schema.rb