touffies 297d906027 Merge branch 'master' into frontend ...

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

2013-11-12 11:09:55 +01:00

..

admin/default

Implemented new assets generation system (cssembed no more required)

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

default

Merge branch 'master' into frontend

2013-11-12 11:09:55 +01:00

pdf/default

Fixed minor internationalizable string error in admin templates.

2013-11-06 20:01:26 +01:00

.gitkeep

set execution right // no more troubles

2013-06-20 15:21:16 +02:00