jfefe ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields ...

Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

2013-03-11 05:21:35 +01:00

..

doc

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields

2013-03-11 05:21:35 +01:00

mod_propale_marbre.php

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

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

mod_propale_saphir.php

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

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

modules_propale.php

Fix: $hookmanager is a global object

2013-01-26 10:35:30 +01:00