gmorel 47106f562d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon ...

Conflicts:
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponI18n.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/ProductAssociatedContent.php
	core/lib/Thelia/Model/Map/CouponTableMap.php
	core/lib/Thelia/Model/Map/CouponVersionTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml

2013-08-28 10:11:57 +02:00

..

lib/Thelia

Merge branch 'coupon' of https://github.com/thelia/thelia into coupon

2013-08-28 10:11:57 +02:00

bootstrap.php

Product loop adjustements

2013-08-01 10:53:35 +02:00