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

Conflicts:
	templates/admin/default/assets/css/admin.less

2013-08-30 15:50:40 +02:00

..

assets

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

2013-08-30 15:50:40 +02:00

coupon

WIP

2013-08-30 15:47:13 +02:00

includes

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

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

404.html

Product loop adjustements

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

categories.html

Factorized ModelCriterialTools calls in loops

2013-08-28 19:47:31 +02:00

edit_category.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

general_error.html

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

home.html

Product loop adjustements

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

login.html

Added category creation and deletion

2013-08-08 02:39:42 +02:00