Laurent Destailleur 57f81217ee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php		2019-02-03 21:14:44 +01:00
..
class	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
card.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
clients.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
index.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-03 21:14:44 +01:00
list.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
quadri_detail.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00