Kevin Granger 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css

2013-07-24 17:01:23 +02:00

..

AdminController.php

// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-07-24 17:01:23 +02:00

Controller.php

// Revert a93cfbec07

2013-04-18 11:36:55 +02:00

FrontController.php

[-] FO : fixed pagination for p = 0 #PSCFV-9746

2013-07-19 14:08:24 +02:00

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

ModuleAdminController.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

ModuleFrontController.php

// Welcome 2013

2013-01-04 11:19:03 +01:00