app/views/admin · 6d600565393ce59ceac3eeaff1d8aff3de61be84 · Hoang Phuc Do / dhp-venshop · GitLab

History Find file

Merge remote-tracking branch 'origin/development' into dhp_order · 6d600565
```
# Conflicts:
#	app/controllers/products_controller.rb
#	app/services/solr.rb
```
Hoang Phuc Do committed Jun 30, 2017
6d600565

Name	Last commit	Last Update
..
orders		Loading commit data...
index.html.erb		Loading commit data...
orders.html.erb		Loading commit data...