mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-22 01:11:21 +01:00
Conflicts: htdocs/bookmarks/bookmarks.lib.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/langs/en_US/other.lang
Conflicts: htdocs/bookmarks/bookmarks.lib.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/langs/en_US/other.lang