dolibarr/htdocs/core/modules/expedition/doc
Laurent Destailleur 9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
..
doc_generic_shipment_odt.modules.php Don't discard previously collected data 2021-03-05 11:32:03 +01:00
pdf_espadon.modules.php Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 19:36:49 +02:00
pdf_merou.modules.php add missing rule 2021-03-01 20:37:16 +01:00
pdf_rouget.modules.php add missing rule 2021-03-01 20:37:16 +01:00