mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-02 23:22:32 +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