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
..
facture-rec.class.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-09-19 01:02:53 +02:00
facture.class.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-19 22:29:18 +01:00
facturestats.class.php	Fix: Fix graph for product distribution.	2013-08-27 11:54:07 +02:00
paymentterm.class.php	Merge branch 'develop' of https://github.com/grandoc/dolibarr into	2014-02-10 01:30:48 +01:00