Laurent Destailleur f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: build/debian/changelog build/doxygen/dolibarr-doxygen.doxyfile build/exe/doliwamp/doliwamp.iss 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.php htdocs/core/modules/import/import_csv.modules.php htdocs/filefunc.inc.php		2014-03-19 22:29:18 +01:00
..
pdf	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-19 22:29:18 +01:00
mod_facture_fournisseur_cactus.php	Qual: Doxygen	2013-08-22 16:49:23 +02:00
mod_facture_fournisseur_tulip.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-08-24 22:41:32 +02:00
modules_facturefournisseur.php	Fix: Permissions on files	2013-08-06 00:36:21 +02:00