gmorel 5509f08df8 Merge branch 'master' of https://github.com/thelia/thelia ...

# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php

2013-09-17 14:40:28 +02:00

..

lib/Thelia

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-17 14:40:28 +02:00

bootstrap.php

Product loop adjustements

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