touffies d1b897a254 Merge branch 'master' into frontend ...

Conflicts:
	core/lib/Thelia/Controller/Admin/OrderController.php

2013-11-12 11:20:46 +01:00

..

font

start integration default template

2013-09-09 17:30:18 +02:00

img

Add favicon

2013-10-29 11:26:59 +01:00

js

Quick validation jsLint

2013-11-08 12:44:10 +01:00

less

Merge branch 'master' into frontend

2013-11-12 11:20:46 +01:00

themes/default/less

Review html for the forms

2013-11-05 15:49:55 +01:00