Laurent Destailleur 8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4 ... 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		2013-06-25 21:31:24 +02:00
..
standard	Merge remote-tracking branch 'origin/3.3' into 3.4	2013-06-25 21:31:24 +02:00
index.php
init_menu_auguria.sql	Fix: parenthesis at wrong place	2013-06-19 22:58:35 +02:00