mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: htdocs/comm/action/fiche.php htdocs/core/class/conf.class.php htdocs/core/class/html.form.class.php htdocs/core/lib/company.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/fourn/facture/fiche.php htdocs/langs/en_US/admin.lang htdocs/margin/agentMargins.php htdocs/margin/customerMargins.php htdocs/margin/productMargins.php htdocs/projet/tasks/task.php |
||
|---|---|---|
| .. | ||
| amarok | ||
| auguria | ||
| bureau2crea | ||
| cameleo | ||
| common | ||
| eldy | ||
| .gitignore | ||
| dolibarr_logo.png | ||
| dolibarr.png | ||
| doliforge_logo.png | ||
| dolistore_logo.png | ||
| index.php | ||
| login_background.png | ||
| login_logo.png | ||