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
..
class	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
emptyexample.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
import.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-08 11:26:08 +01:00
index.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00