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

..

admin

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

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

index.php

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

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

pre.inc.php

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

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