Franck Allimant ead038723f Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Template.php

2013-11-06 11:16:27 +01:00

..

admin/default

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

2013-11-06 11:16:27 +01:00

default

Missing single quote for the french translation

2013-11-06 10:25:30 +01:00

pdf/default

Implementing translations (still in progress)

2013-11-06 10:49:03 +01:00

.gitkeep

set execution right // no more troubles

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