COPYRIGHT · d2cc6d299c70202a7ce7ca9858a24c7b5e104308 · Software_Artifact_Infrastructure_Repository / dolibarr

12 years ago

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

Laurent Destailleur authored 12 years ago

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

d11cee39

History

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

Laurent Destailleur authored 12 years ago

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