franck b1f3a229b6 Merge branch 'admin' of https://github.com/thelia/thelia into admin ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php

2013-06-26 10:46:55 +02:00

..

lib/Thelia

Merge branch 'admin' of https://github.com/thelia/thelia into admin

2013-06-26 10:46:55 +02:00

bootstrap.php

set execution right // no more troubles

2013-06-20 15:21:16 +02:00