gmorel 180302e7cc Merge branch 'master' of https://github.com/thelia/thelia into coupon ...

# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Factorized ModelCriterialTools calls in loops

Conflicts:
	templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
	templates/admin/default/assets/css/admin.less

2013-08-30 15:43:43 +02:00

..

lib/Thelia

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

2013-08-30 15:43:43 +02:00

bootstrap.php

Product loop adjustements

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