mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: htdocs/accountancy/bookkeeping/listbyyear.php htdocs/accountancy/journal/bankjournal.php htdocs/compta/facture/list.php htdocs/filefunc.inc.php htdocs/fourn/facture/list.php htdocs/install/mysql/migration/3.9.0-4.0.0.sql htdocs/projet/activity/index.php |
||
|---|---|---|
| .. | ||
| api_category.class.php | ||
| categorie.class.php | ||
| index.html | ||