Manuel Raynaud eca8b01fb6 revert last conflic

2013-12-09 16:18:59 +01:00

..

backOffice/default

revert last conflic

2013-12-09 16:18:59 +01:00

email/default

Adding translation for Backoffice

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

frontOffice/default

Add missing page for folder

2013-12-09 15:00:52 +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