Conflicts: ChangeLog build/debian/changelog build/exe/doliwamp/doliwamp.iss build/makepack-dolibarr.pl build/perl/virtualmin/dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/compta/facture/class/facture-rec.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/filefunc.inc.php |
||
|---|---|---|
| .. | ||
| auguria_menu.php | ||
| auguria.lib.php | ||
| eldy_menu.php | ||
| eldy.lib.php | ||
| empty.php | ||
| index.php | ||