Laurent Destailleur 2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture.php htdocs/compta/facture/fiche-rec.php htdocs/contact/list.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/facture/card.php htdocs/societe/list.php htdocs/user/document.php		2017-04-11 11:43:54 +02:00
..
tpl	FIX #6315	2017-02-02 02:53:32 +01:00
card.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-04-11 11:43:54 +02:00
contact.php	Fix permission	2017-01-22 23:08:11 +01:00
document.php	Fix permission	2017-01-22 23:08:11 +01:00
impayees.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01: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
info.php	Fix permission	2017-01-22 23:08:11 +01:00
list.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-02-08 10:57:02 +01:00
note.php	Fix permission	2017-01-22 23:08:11 +01:00
paiement.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-03-29 11:48:35 +02:00