dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
3cfe76ec0c6ba5bdea4fe9e974dde46331cc712d
PrestaShop/classes/module
History
Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
..
CarrierModule.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
ImportModule.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
Module.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-30 11:01:23 +02:00
ModuleGraph.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
ModuleGraphEngine.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
ModuleGrid.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
ModuleGridEngine.php
// Welcome 2013
2013-01-04 11:19:03 +01:00