Laurent Destailleur fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/facture.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/main.inc.php		2015-01-09 23:09:10 +01:00
..
index.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
newpayment.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-01-09 23:09:10 +01:00
paymentko.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-06-09 15:30:41 +02:00
paymentok.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-06-09 15:30:41 +02:00