Laurent Destailleur b81de35703 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/class/facture.class.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/contrat/class/contrat.class.php		2017-05-12 15:44:09 +02:00
..
class	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-12 15:44:09 +02:00
card.php	FIX total payed wrong	2017-01-18 13:28:02 +01:00
document.php	Social contribution : Complete work on dol_banner	2016-12-20 21:59:05 +01:00
index.php	Fix label "total for this page" on last page.	2017-05-10 11:57:59 +02:00
info.php	Social contribution : Complete work on dol_banner	2016-12-20 21:59:05 +01:00
payments.php	Uniformise code	2016-08-22 13:46:38 +02:00