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-07-04 18:21:24 +02:00
2013-07-01 11:10:52 +02:00
2013-06-26 11:05:48 +02:00
2013-07-04 19:46:08 +02:00
2013-06-20 15:21:16 +02:00
2013-07-04 19:46:08 +02:00
2013-06-20 15:21:16 +02:00
2013-07-03 15:05:08 +02:00
2013-06-20 15:21:16 +02:00
2013-07-04 19:46:08 +02:00
2013-06-20 15:21:16 +02:00
2013-06-26 14:45:19 +02:00
2013-06-20 15:21:16 +02:00
2013-06-25 08:55:08 +02:00