mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: htdocs/commande/class/commandestats.class.php htdocs/core/actions_massactions.inc.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/holiday/month_report.php htdocs/product/class/product.class.php htdocs/product/stock/class/mouvementstock.class.php htdocs/societe/list.php |
||
|---|---|---|
| .. | ||
| doc_generic_proposal_odt.modules.php | ||
| pdf_azur.modules.php | ||
| pdf_cyan.modules.php | ||