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

Browse Source

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

...

This commit is contained in:

gmorel

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

parent f1ed03a96a 3005a65463

commit 47106f562d

3190 changed files with 2396 additions and 3847 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

local/config/database.yml.sample Normal file → Executable file

0

local/media/.gitkeep Normal file → Executable file