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

..

Resources

Merge branch 'master' into tax

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

DatabaseConfiguration.php

fix usage of ProfilerConnectionWrapper

2013-09-30 15:35:46 +02:00

DefinePropel.php

apply cs-fixer

2013-08-14 09:29:04 +02:00