2 Commits

Author	SHA1	Message	Date
Manuel Raynaud	9ed14bf7a3	change default locale to en_US	2013-07-05 11:21:31 +02:00
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