franck 2eca5464b7 Merge branch 'smarty' into admin ...

Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/EventListener/ViewListener.php
	core/lib/Thelia/Core/Template/SmartyParser.php
	templates/smarty-sample/index.html

2013-06-19 11:20:41 +02:00

..

admin/default

Cleanup

2013-06-19 10:33:29 +02:00

default

rename plugins to modules

2013-05-16 11:13:09 +02:00

smarty-sample

Merge branch 'smarty' into admin

2013-06-19 11:20:41 +02:00

.gitkeep

declare base folders

2012-10-02 15:23:26 +02:00