Laurent Destailleur 8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php		2019-03-02 19:13:37 +01:00
..
tpl	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
card.php	Look and feel v10	2019-02-26 19:37:32 +01:00
contact.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
dispatch.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-23 16:02:35 +01:00
document.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
index.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
info.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
list.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-03-02 19:13:37 +01:00
note.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
orderstoinvoice.php	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00