TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
059317c26667177ecc7f524fea2e249faf4f460e
sterivein/local
History
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
..
cache
set execution right // no more troubles
2013-06-20 15:21:16 +02:00
config
Merge branch 'coupon' of https://github.com/thelia/thelia into coupon
2013-08-28 10:11:57 +02:00
media
Merge branch 'master' into loops
2013-08-21 09:19:56 +02:00
modules
set execution right // no more troubles
2013-06-20 15:21:16 +02:00
session
set execution right // no more troubles
2013-06-20 15:21:16 +02:00
.gitkeep
set execution right // no more troubles
2013-06-20 15:21:16 +02:00