mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: htdocs/admin/dict.php htdocs/comm/action/list.php htdocs/compta/bank/releve.php htdocs/compta/salaries/card.php htdocs/core/actions_addupdatedelete.inc.php htdocs/filefunc.inc.php htdocs/langs/en_US/boxes.lang htdocs/langs/en_US/main.lang htdocs/product/class/product.class.php htdocs/product/reassort.php htdocs/product/stock/product.php htdocs/projet/element.php |
||
|---|---|---|
| .. | ||
| dynamic_prices.php | ||
| index.html | ||
| price_rules.php | ||
| product_extrafields.php | ||
| product_lot_extrafields.php | ||
| product_supplier_extrafields.php | ||
| product_tools.php | ||
| product.php | ||
| stock_extrafields.php | ||