touffies 9d5aa5e077 Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml

2013-10-22 11:55:58 +02:00

..

address-update-modal.html

Cleanup :

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

product-attributes-tab.html

Finished combination creation GUI

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

product-related-tab.html

permission management

2013-10-22 11:09:24 +02:00

template-attribute-list.html

permission management

2013-10-22 11:09:24 +02:00

template-feature-list.html

permission management

2013-10-22 11:09:24 +02:00

thelia_news_feed.html

Beautiful login page

2013-09-16 15:14:26 +02:00