Manuel Raynaud b8345fa30d Merge branch 'master' into http_caching ...

Conflicts:
	core/lib/Thelia/Core/TheliaHttpKernel.php

2013-11-19 14:26:29 +01:00

..

lib/Thelia

Merge branch 'master' into http_caching

2013-11-19 14:26:29 +01:00

bootstrap.php

Implemented new assets generation system (cssembed no more required)

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