mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: ChangeLog htdocs/compta/prelevement/bons.php htdocs/compta/prelevement/fiche-stat.php htdocs/contact/class/contact.class.php htdocs/contrat/class/contrat.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/modSociete.class.php htdocs/projet/fiche.php test/phpunit/FilesLibTest.php |
||
|---|---|---|
| .. | ||
| adodbtime | ||
| ckeditor | ||
| fonts | ||
| fpdfi | ||
| geoip | ||
| jquery | ||
| jsgantt | ||
| nusoap/lib | ||
| odtphp | ||
| phpexcel | ||
| printipp | ||
| tcpdf | ||
| index.php | ||