mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: ChangeLog htdocs/adherents/admin/adherent.php htdocs/comm/propal/class/propal.class.php htdocs/commande/document.php htdocs/compta/facture/class/facture.class.php htdocs/compta/facture/list.php htdocs/cron/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/fourn/commande/document.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cron.lang htdocs/langs/fr_FR/projects.lang htdocs/langs/nl_NL/admin.lang htdocs/langs/nl_NL/categories.lang htdocs/langs/nl_NL/commercial.lang htdocs/langs/nl_NL/companies.lang htdocs/langs/nl_NL/dict.lang htdocs/langs/nl_NL/main.lang htdocs/langs/nl_NL/margins.lang htdocs/langs/nl_NL/products.lang htdocs/societe/class/societe.class.php htdocs/societe/rib.php |
||
|---|---|---|
| .. | ||
| doctemplates | ||
| lib | ||
| mssql | ||
| mysql | ||
| pgsql | ||
| background.png | ||
| check.php | ||
| default.css | ||
| etape1.php | ||
| etape2.php | ||
| etape4.php | ||
| etape5.php | ||
| fileconf.php | ||
| headbg.jpg | ||
| inc.php | ||
| index.php | ||
| phpinfo.php | ||
| repair.php | ||
| robots.txt | ||
| upgrade.php | ||
| upgrade2.php | ||