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

..

Resources

Merge branch 'master' into content

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

DatabaseConfiguration.php

apply cs-fixer

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

DefinePropel.php

apply cs-fixer

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