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

Conflicts:
	admin-dev/themes/default/css/admin-theme.css

2013-10-25 15:22:01 +02:00

..

admin

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

2013-10-25 15:22:01 +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