mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-07 09:32:47 +01:00
Conflicts: htdocs/comm/mailing/cibles.php htdocs/core/extrafieldsinexport.inc.php htdocs/product/stock/card.php
Conflicts: htdocs/comm/mailing/cibles.php htdocs/core/extrafieldsinexport.inc.php htdocs/product/stock/card.php