Etienne Roudeix 247ed6aa2a Merge branch 'master' into modules ...

Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php

2013-11-28 10:34:57 +01:00

..

config

Implemented mail messages templates and layouts

2013-11-27 21:21:07 +01:00

media

Merge branch 'master' into loops

2013-08-21 09:19:56 +02:00

modules

Merge branch 'master' into modules

2013-11-28 10:34:57 +01:00

session

set execution right // no more troubles

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

.gitkeep

set execution right // no more troubles

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