Laurent Destailleur 21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/categories/index.php htdocs/comm/action/list.php htdocs/comm/action/rapport/index.php htdocs/compta/paiement.php htdocs/compta/sociales/document.php htdocs/compta/tva/document.php htdocs/core/actions_massactions.inc.php htdocs/core/class/commonobject.class.php htdocs/fourn/facture/paiement.php htdocs/loan/document.php htdocs/main.inc.php		2019-06-04 19:03:27 +02:00
..
class	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-06-04 19:03:27 +02:00
agenda.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
card.php	Fix parameters of accessforbidden	2019-06-04 12:21:27 +02:00
contact.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
document.php	Look and feel v10	2019-03-29 13:26:26 +01:00
element_resource.php	Fix phpcs	2019-04-09 00:48:12 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
list.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-06-04 19:03:27 +02:00
note.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00