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
..
2013-06-24 10:21:59 +02:00
2013-06-24 10:21:59 +02:00
2013-06-24 14:50:06 +02:00
2013-07-02 17:19:13 +02:00
2013-07-01 11:10:52 +02:00
2013-06-24 10:21:59 +02:00
2013-07-04 19:46:08 +02:00
2013-06-24 10:21:59 +02:00
2013-07-04 19:46:08 +02:00
2013-06-24 10:21:59 +02:00
2013-07-04 19:46:08 +02:00