franck 162084140e Merge remote-tracking branch 'origin/master' into admin ...

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php

2013-07-06 10:34:09 +02:00

..

admin/default

Added Feed loop to retreive feeds using SimplePie

2013-07-06 10:18:19 +02:00

default

set execution right // no more troubles

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

smarty-sample

Merge remote-tracking branch 'origin/master' into admin

2013-07-06 10:34:09 +02:00

.gitkeep

set execution right // no more troubles

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