Etienne Roudeix c63c509f2f Merge branch 'master' into tax ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html

2013-10-21 08:13:18 +02:00

..

Admin

Merge branch 'master' into tax

2013-10-21 08:13:18 +02:00

Front

Update profile - new method [Not finished yet]

2013-10-18 09:47:11 +02:00

BaseController.php

enabled change default country

2013-10-08 10:16:18 +02:00

NullControllerInterface.php

set execution right // no more troubles

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