Etienne Roudeix ee6a2a645f Merge branch 'master' of github.com:thelia/thelia ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-07-26 15:45:26 +02:00

..

Resources

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

2013-07-26 15:45:26 +02:00

DatabaseConfiguration.php

Fix source header alignment

2013-07-17 15:06:53 +02:00

DefinePropel.php

Fix source header alignment

2013-07-17 15:06:53 +02:00