Franck Allimant d1c54ea62a Merge branch 'catalog' ...

Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php

2013-10-30 19:55:10 +01:00

..

address-update-modal.html

Cleanup :

2013-10-22 09:44:45 +02:00

language-update-modal.html

create ajax modal for lang edition

2013-10-23 12:38:32 +02:00

logger.html

admin log

2013-10-29 16:09:50 +01:00

product-attributes-tab.html

Finished combination creation GUI

2013-09-23 11:41:14 +02:00

product-related-tab.html

fix auth loop

2013-10-22 15:57:31 +02:00

template-attribute-list.html

fix auth loop

2013-10-22 15:57:31 +02:00

template-feature-list.html

fix auth loop

2013-10-22 15:57:31 +02:00

thelia_news_feed.html

added timestamp parameter to format_date sparty plugin

2013-10-30 19:52:47 +01:00