Commit Graph

7 Commits

Author SHA1 Message Date
Manuel Raynaud
462b2bec5e Merge branch 'master' into frontend
Conflicts:
	templates/backOffice/default/folder-edit.html
2013-12-09 16:15:58 +01:00
gmorel
d769f51186 Fix typo 2013-12-09 15:19:14 +01:00
touffies
d476672150 Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT 2013-12-09 15:00:51 +01:00
Michaël Espeche
990cda786d Add of hook module to content and folder edition page. 2013-12-09 10:36:09 +01:00
gmorel
e7038c9369 Spelling rewritten with 2 t 2013-11-27 20:37:40 +01:00
gmorel
dc648fef62 Merge master 2013-11-27 20:24:38 +01:00
Etienne Roudeix
25192cf366 change template subdirs 2013-11-13 10:24:14 +01:00