Manuel Raynaud 715e7ac294 Merge branch 'customer' ...

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html

2013-07-04 19:46:08 +02:00

3.0 KiB

Executable File

Raw Blame History

View Raw