mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-22 01:11:21 +01:00
Conflicts: htdocs/adherents/card.php htdocs/bom/bom_card.php htdocs/core/class/ldap.class.php htdocs/core/lib/files.lib.php htdocs/fichinter/class/fichinterrec.class.php htdocs/filefunc.inc.php htdocs/langs/en_US/admin.lang