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

Conflicts:
	templates/default/login.html

2013-08-30 19:48:26 +02:00

..

assets

Fixed customer front controller, events, addec admion config.

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

includes

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

2013-08-30 19:48:26 +02:00

404.html

Product loop adjustements

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

categories.html

Fixed customer front controller, events, addec admion config.

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

configuration.html

Fixed customer front controller, events, addec admion config.

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

edit_category.html

Fixed customer front controller, events, addec admion config.

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

general_error.html

Fixed customer front controller, events, addec admion config.

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

home.html

Product loop adjustements

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

login.html

Fixed customer front controller, events, addec admion config.

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