mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: htdocs/admin/dict.php htdocs/bom/tpl/objectline_create.tpl.php htdocs/bom/tpl/objectline_edit.tpl.php htdocs/bom/tpl/objectline_view.tpl.php htdocs/core/boxes/box_shipments.php htdocs/societe/class/societe.class.php |
||
|---|---|---|
| .. | ||
| linkedobjectblock.tpl.php | ||
| objectline_create.tpl.php | ||
| objectline_edit.tpl.php | ||
| objectline_title.tpl.php | ||
| objectline_view.tpl.php | ||