38de69f5a9
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 |
||
|---|---|---|
| .. | ||
| admin | ||
| class | ||
| stats | ||
| card.php | ||
| document.php | ||
| info.php | ||
| list.php | ||