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

Conflicts:
	templates/admin/default/categories.html
	templates/admin/default/includes/add-category-dialog.html
	templates/admin/default/includes/delete-category-dialog.html

2013-09-06 16:18:54 +02:00

..

add-category-dialog.html

Categories refactoring

2013-09-06 15:56:06 +02:00

delete-category-dialog.html

Categories refactoring

2013-09-06 15:56:06 +02:00

inner-form-toolbar.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

standard-description-form-fields.html

Working :

2013-09-06 12:12:27 +02:00

thelia_news_feed.html

Merge branch 'master' into loops

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