Manuel Raynaud b1517945f4 Merge branch 'modules' ...

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

2013-11-06 14:37:31 +01:00

..

Admin

Merge branch 'modules'

2013-11-06 14:37:31 +01:00

Front

Merge branch 'modules'

2013-11-06 14:37:31 +01:00

BaseController.php

refactor render template process

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

NullControllerInterface.php

set execution right // no more troubles

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