Laurent Destailleur d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/accountancy/class/accountancyexport.class.php htdocs/accountancy/tpl/export_journal.tpl.php htdocs/projet/tasks/time.php		2021-08-02 18:31:26 +02:00
..
export_journal.tpl.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-08-02 18:31:26 +02:00
index.html