Laurent Destailleur 7982cab526 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/core/modules/contract/doc/pdf_strato.modules.php htdocs/ticket/card.php		2021-01-21 18:34:55 +01:00
..
doc_generic_contract_odt.modules.php	Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT	2020-12-02 21:27:15 +01:00
index.html
pdf_strato.modules.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-21 18:34:55 +01:00