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

..

Cheque

PaymentModuleInterface::pay method force $order parameter

2013-12-16 12:38:41 +01:00

Colissimo

Added sorting and position ùmanagement to modules.

2013-12-06 18:59:46 +01:00

Front

coupon management in order and cart process

2013-12-19 14:17:22 +01:00

TheliaDebugBar

Renamed backoffice to backOffice

2013-12-02 19:05:02 +01:00

.gitkeep

set execution right // no more troubles

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