Manuel Raynaud 0c24a8afc0 Merge branch 'master' into modules ...

Conflicts:
	templates/backOffice/default/product-edit.html

2013-12-17 10:48:59 +01:00

..

config

Rename meta_keyword to meta_keywords

2013-12-09 14:52:46 +01:00

media

Merge branch 'master' into loops

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

modules

Merge branch 'cleanmaster' into modules

2013-12-16 14:33:15 +01:00

session

set execution right // no more troubles

2013-06-20 15:21:16 +02:00

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00