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
parent 5fda702b8d abe6064955
commit 715e7ac294
237 changed files with 252286 additions and 12 deletions
--- a/templates/smarty-sample/index.html
+++ b/templates/smarty-sample/index.html
@@ -17,6 +17,7 @@ An image from asset directory :
    <li>{$__COUNT__}/{$__TOTAL__} : {$ID} {$TITLE}</li>
 {/loop}

+
 <div>
 	<p>Conditional example #1</p>