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

12 KiB

Raw Blame History

View Raw