Laurent Destailleur 9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: ChangeLog 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/paiement_charge.php htdocs/compta/sociales/charges.php htdocs/core/db/mysql.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php		2014-05-06 23:58:17 +02:00
..
class	Removed closing php tag	2014-05-03 18:18:44 +02:00
stats	Removed closing php tag	2014-05-03 18:18:44 +02:00
tpl	Corrected incorrect lang trans key	2013-04-27 13:51:05 +02:00
contact.php	Uniformize code for contacts forms.	2014-02-04 20:49:07 +01:00
fiche.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-04-26 22:35:35 +02:00
index.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
liste.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
note.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-05-06 23:58:17 +02:00
shipment.php	Removed closing php tag	2014-05-03 18:18:44 +02:00