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

Conflicts:
	templates/admin/default/category-edit.html

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

..

Admin

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

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

Front

order creation

2013-09-19 15:11:54 +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