dolibarr/scripts
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
..
clicktodial New: Add ekiga launcher for click to dial with ekiga 2012-07-11 11:47:52 +02:00
company Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
emailings Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
invoices Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 15:45:17 +01:00
members Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
user Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
withdrawals Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00