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
..
doc	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-08 11:26:08 +01:00
index.html
mod_facture_mars.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
mod_facture_mercure.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
mod_facture_terre.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
modules_facture.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00