Etienne Roudeix 338ec5fce6 Merge branch 'loops' ...

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

2013-07-31 13:56:05 +02:00

..

lib/Thelia

Merge branch 'loops'

2013-07-31 13:56:05 +02:00

bootstrap.php

generate Model using Propel command in Thelia app

2013-07-11 16:44:18 +02:00