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

..

assets

Added documents action and loop

2013-09-17 01:07:42 +02:00

AddressTest.php

start testing folder crud

2013-10-01 11:29:47 +02:00

BaseAction.php

fix cs

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

ContentTest.php

fix cs

2013-12-18 10:04:13 +01:00

CustomerTest.php

fix cs

2013-09-30 10:35:34 +02:00

DocumentTest.php

start testing folder crud

2013-10-01 11:29:47 +02:00

FolderTest.php

fix getPosition folder test

2013-12-19 15:46:03 +01:00

ImageTest.php

start testing folder crud

2013-10-01 11:29:47 +02:00

OrderTest.php

fix cs

2013-12-18 10:04:13 +01:00

RewrittenUrlTestTrait.php

Merge branch 'master' into modules

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