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

Conflicts:
	core/lib/Thelia/Controller/BaseController.php

2013-09-03 19:03:27 +02:00

..

BaseFrontController.php

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

2013-09-03 19:03:27 +02:00

CartController.php

Completed the backoffice variable management

2013-09-02 00:17:27 +02:00

CustomerController.php

Completed mailing templates management

2013-09-02 16:21:49 +02:00

DefaultController.php

hot fix

2013-09-03 16:57:31 +02:00

UrlRewritingController.php

rewriting

2013-09-03 16:51:41 +02:00