mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-07 10:08:27 +01:00
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