forked from Wavyzz/dolibarr
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
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