Laurent Destailleur 026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/list.php htdocs/core/class/html.form.class.php htdocs/core/lib/ajax.lib.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/fournisseurs.php		2021-02-15 13:12:27 +01:00
..
doc_generic_contract_odt.modules.php	contract - use multidir_output	2021-02-10 13:18:55 +01:00
index.html
pdf_strato.modules.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-02-15 13:12:27 +01:00