Laurent Destailleur 38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/db/pgsql.class.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/filefunc.inc.php htdocs/imports/import.php htdocs/supplier_proposal/card.php		2019-02-08 11:26:08 +01:00
..
card.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
commande_fournisseur.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
commande.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
contrat.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
facture_fournisseur.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-08 11:26:08 +01:00
facture.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +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
propal.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
supplier_proposal.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00