Franck Allimant 9092e39296 Merge branch 'master' into modules ...

Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php

2013-12-20 11:32:01 +01:00

..

backOffice/default

Merge branch 'master' into modules

2013-12-20 11:32:01 +01:00

email/default

Adding translation for Backoffice

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

frontOffice/default

show coupon codes in back office

2013-12-19 14:50:45 +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