Manuel Raynaud 0c564be4c5 Merge branch 'master' of https://github.com/enurit/thelia into enurit-master ...

Conflicts:
	templates/frontOffice/default/I18n/fr_FR.php

2014-01-14 19:21:01 +01:00

..

backOffice/default

prepare tinymce module

2014-01-13 17:54:22 +01:00

email/default

Adding translation for Backoffice

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

frontOffice/default

Merge branch 'master' of https://github.com/enurit/thelia into enurit-master

2014-01-14 19:21:01 +01:00

pdf/default

[back office] add pdf french translation

2014-01-14 15:55:56 +01:00

.gitkeep

set execution right // no more troubles

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