Manuel Raynaud 3c87fa8bd0 Merge branch 'master' into cart ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	install/faker.php

2013-08-07 10:23:44 +02:00

..

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

faker.php

Merge branch 'master' into cart

2013-08-07 10:23:44 +02:00

insert.sql

Merge branch 'cart'

2013-08-01 10:52:17 +02:00

INSTALL-TODO.txt

complete INTALL-TODO

2013-08-07 10:20:04 +02:00

thelia.sql

allow token to be null in cart table

2013-08-06 11:53:30 +02:00