Laurent Destailleur f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/accountancy/class/bookkeeping.class.php htdocs/compta/facture/list.php htdocs/compta/paiement/class/cpaiement.class.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/expensereport/card.php htdocs/expensereport/class/expensereport.class.php htdocs/product/stats/facture.php		2017-07-08 18:32:34 +02:00
..
card.php	Escape hml tags	2017-06-18 19:42:59 +02:00
commande_fournisseur.php	Merge 5.0	2017-06-12 18:22:51 +02:00
commande.php	Merge 5.0	2017-06-12 18:22:51 +02:00
contrat.php	Merge 5.0	2017-06-12 18:22:51 +02:00
facture_fournisseur.php	Merge 5.0	2017-06-12 18:22:51 +02:00
facture.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 18:32:34 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
propal.php	Merge 5.0	2017-06-12 18:22:51 +02:00