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

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

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

..

backOffice/default

Merge branch 'master' into modules

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

email/default

Adding translation for Backoffice

2013-12-09 15:19:15 +01:00

frontOffice/default

Merge branch 'master' into frontend

2013-12-16 15:45:04 +01:00

pdf/default

Merge master

2013-12-04 14:42:15 +01:00

.gitkeep

set execution right // no more troubles

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