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

Conflicts:
	templates/default/login.html

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

..

add-category-dialog.html

Merge branch 'master' into loops

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

category_breadcrumb.html

Factorized ModelCriterialTools calls in loops

2013-08-28 19:47:31 +02:00

delete-category-dialog.html

Merge branch 'master' into loops

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

footer.inc.html

Added category creation and deletion

2013-08-08 02:39:42 +02:00

header.inc.html

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

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

inner-form-toolbar.html

Factorized ModelCriterialTools calls in loops

2013-08-28 19:47:31 +02:00

js.inc.html

Merge branch 'master' into loops

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

thelia_news_feed.html

Merge branch 'master' into loops

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