mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-12 20:41:26 +01:00
Conflicts: htdocs/accountancy/tpl/export_journal.tpl.php htdocs/includes/tecnickcom/tcpdf/tcpdf.php
Conflicts: htdocs/accountancy/tpl/export_journal.tpl.php htdocs/includes/tecnickcom/tcpdf/tcpdf.php