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

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

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

..

lib/Thelia

Merge branch 'master' into frontend

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

bootstrap.php

Implemented new assets generation system (cssembed no more required)

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