sterivein

Files

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

Conflicts:
	templates/admin/default/admin-layout.tpl

2013-09-10 15:46:51 +02:00

catalog-breadcrumb.html

2013-09-06 20:00:02 +02:00

confirmation-modal.html

2013-09-04 17:09:59 +02:00

coupon_breadcrumb.html

2013-09-04 17:09:59 +02:00

generic-confirm-dialog.html

2013-09-06 20:00:02 +02:00

generic-create-dialog.html

2013-09-10 15:45:29 +02:00

generic-js-dialog.html

2013-09-06 20:26:29 +02:00

inner-form-toolbar.html

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

notifications.html

2013-09-04 12:01:12 +02:00

standard-description-form-fields.html

Working :

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

thelia_news_feed.html

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