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

..

Bundle

remove Thelia ResponseListener

2013-11-20 14:45:40 +01:00

Controller

Finished log configuration. All loggers are currentrly working

2013-11-01 16:15:19 +01:00

DependencyInjection

fix cs

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

Event

Merge branch 'master' into modules

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

EventListener

Merge branch 'master' into modules

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

Factory

add some phpdoc

2013-09-01 11:32:05 +02:00

Form/Type

fix cs

2013-10-25 10:07:21 +02:00

HttpFoundation

fix cs

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

HttpKernel

fix cs

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

Routing

empty cart or delivery exception

2013-09-17 16:38:16 +02:00

Security

fix cs

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

Template

Merge branch 'master' into modules

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

Translation

fix cs

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

Application.php

add some phpdoc

2013-09-01 11:32:05 +02:00

Thelia.php

Merge branch 'master' into modules

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

TheliaContainerBuilder.php

add some phpdoc

2013-09-01 11:32:05 +02:00

TheliaHttpKernel.php

fix cs

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