Laurent Destailleur d11cee399a Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql

2013-01-16 15:45:17 +01:00

..

ckeditor

Fix: checkstyle

2012-12-15 11:39:47 +01:00

img

Fix: Missing picto

2013-01-08 10:28:22 +01:00

tpl

GUI: Update amarok theme to work into 3.3

2012-12-14 13:01:57 +01:00

AUTHOR

GUI: Update amarok theme to work into 3.3

2012-12-14 13:01:57 +01:00

graph-color.php

Merge remote-tracking branch 'origin/3.3' into develop

2013-01-16 15:45:17 +01:00

index.php

GUI: Update amarok theme to work into 3.3

2012-12-14 13:01:57 +01:00

style.css.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

thumb.png

GUI: Update amarok theme to work into 3.3

2012-12-14 13:01:57 +01:00