mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-03-09 20:06:57 +01:00
Conflicts: htdocs/admin/tools/export_files.php htdocs/comm/mailing/class/advtargetemailing.class.php htdocs/core/tpl/advtarget.tpl.php
Conflicts: htdocs/admin/tools/export_files.php htdocs/comm/mailing/class/advtargetemailing.class.php htdocs/core/tpl/advtarget.tpl.php