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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	reset_install.sh

2013-09-04 16:05:25 +02:00

..

Resources

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

2013-09-04 16:05:25 +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