Jerome Nadaud 8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	controllers/admin/AdminCategoriesController.php

2013-10-25 14:29:02 +02:00

..

assoshop.tpl

// Welcome 2013

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

form_category.tpl

// some work on style sheets

2013-07-18 18:51:24 +02:00

form_group.tpl

// categories group

2013-10-21 12:21:35 +02:00

form.tpl

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

2013-10-25 14:29:02 +02:00

index.php

// Welcome 2013

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