franck abdff9bc1a Merge branch 'admin' ...

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php

2013-07-08 11:27:37 +02:00

..

AdminLogin.php

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

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

BaseForm.php

fix typo in phpdoc

2013-07-03 14:45:18 +02:00

CustomerCreation.php

change compatibility for propel2

2013-07-05 15:59:41 +02:00

CustomerModification.php

fix typo in phpdoc

2013-07-03 14:45:18 +02:00