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

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

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

..

bootstrap

start integration default template

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

fontawesome

Remove path.less in thelia's folder

2013-10-10 16:41:50 +02:00

thelia

Show dropdown chevron-down only if js is enable

2013-11-08 15:43:52 +01:00

styles.less

Implemented new assets generation system (cssembed no more required)

2013-11-12 01:32:29 +01:00