db/migrate/20170623064632_add_admin_to_users.rb · development · Hoang Phuc Do / dhp-venshop · GitLab

Blame History Permalink

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

20170623064632_add_admin_to_users.rb 148 Bytes