Etienne Roudeix 99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" ...

This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php

2014-01-06 11:25:25 +01:00

..

Exception

fix cs

2013-10-18 09:28:17 +02:00

schema/module

complete french translation

2013-11-05 15:59:14 +01:00

BaseModule.php

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

BaseModuleInterface.php

Revert "Revert "Merge branch 'cleanmaster' into modules""

2014-01-06 11:25:25 +01:00

DeliveryModuleInterface.php

postage + invoice step

2013-09-17 19:47:10 +02:00

ModuleDescriptorValidator.php

fix cs

2013-10-18 09:28:17 +02:00

ModuleManagement.php

fix cs

2013-10-18 09:28:17 +02:00

PaymentModuleInterface.php

PaymentModuleInterface::pay method force $order parameter

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