Manuel Raynaud 462b2bec5e Merge branch 'master' into frontend ...

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

2013-12-09 16:15:58 +01:00

..

Thelia

Merge branch 'master' into frontend

2013-12-09 16:15:58 +01:00