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
..
admin	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
ajax	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
canvas	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
class	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
composition	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
dynamic_price	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
inventory	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
stats	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-08 11:26:08 +01:00
stock	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
agenda.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
card.php	wip	2019-01-30 22:53:47 +01:00
document.php	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
fournisseurs.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
index.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-02-01 18:31:44 +01:00
list.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
note.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
popuprop.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
price.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
reassort.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
reassortlot.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
traduction.php	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00