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

..

admin

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

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

front

changed path from dirname(__FILE__) to PS_ROOT_DIR

2013-10-24 11:44:52 +02:00

index.php

// Welcome 2013

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