mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: ChangeLog htdocs/categories/fiche.php htdocs/comm/action/index.php htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/class/commonobject.class.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fourn/fiche.php htdocs/product/composition/fiche.php htdocs/product/price.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php |
||
|---|---|---|
| .. | ||
| admin | ||
| class | ||
| group | ||
| agenda_extsites.php | ||
| card.php | ||
| clicktodial.php | ||
| document.php | ||
| hierarchy.php | ||
| home.php | ||
| index.php | ||
| info.php | ||
| ldap.php | ||
| logout.php | ||
| note.php | ||
| param_ihm.php | ||
| passwordforgotten.php | ||
| perms.php | ||