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

..

Admin

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

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

Front

Issue 61

2013-11-07 12:35:34 +01:00

BaseController.php

refactor render template process

2013-11-06 13:48:32 +01:00