Manuel Raynaud 365d90b4a8 Merge branch 'master' into template ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php

2013-09-16 10:19:40 +02:00

..

Admin

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

2013-09-16 10:01:34 +02:00

Front

Merge branch 'master' into template

2013-09-13 12:36:56 +02:00

Install

First version of installation wizard

2013-09-13 18:03:45 +02:00

BaseController.php

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

2013-09-16 10:01:34 +02:00

NullControllerInterface.php

set execution right // no more troubles

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