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

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

2013-09-02 09:41:30 +02:00

..

assets

WIP

2013-09-02 09:35:17 +02:00

coupon

WIP

2013-08-30 16:32:01 +02:00

includes

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

2013-09-02 09:19:24 +02:00

404.html

Product loop adjustements

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

categories.html

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

2013-09-02 09:19:24 +02:00

configuration.html

Added get/setLangId() method in session

2013-09-02 02:04:36 +02:00

edit_category.html

Added get/setLangId() method in session

2013-09-02 02:04:36 +02:00

general_error.html

Fixed customer front controller, events, addec admion config.

2013-08-30 19:46:12 +02:00

home.html

Added get/setLangId() method in session

2013-09-02 02:04:36 +02:00

login.html

Fixed customer front controller, events, addec admion config.

2013-08-30 19:46:12 +02:00

variable-edit.html

Added get/setLangId() method in session

2013-09-02 02:04:36 +02:00

variables.html

Added get/setLangId() method in session

2013-09-02 02:04:36 +02:00