Franck Allimant f6fc886d06 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php

2013-11-09 18:31:52 +01:00

..

lib/Thelia

Merge branch 'master' of https://github.com/thelia/thelia

2013-11-09 18:31:52 +01:00

bootstrap.php

Optimisation of THELIA_* constants usage

2013-11-08 11:22:26 +01:00