Manuel Raynaud 805b38ab9a Merge branch 'master' into content ...

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	templates/admin/default/folders.html

2013-09-20 17:41:38 +02:00

..

Admin

Merge branch 'master' into content

2013-09-20 17:41:38 +02:00

Front

order process

2013-09-20 16:25:46 +02:00

BaseController.php

Merge branch 'install_wizard'

2013-09-17 16:02:24 +02:00

NullControllerInterface.php

set execution right // no more troubles

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