app/views/admin/orders · 63adf1fac7f568bad981a2ee807b9cd3f5cca9e2 · Hoang Phuc Do / dhp-venshop · GitLab

History Find file

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

Name	Last commit	Last Update
..
_order_table.html.erb		Loading commit data...