Laurent Destailleur 1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/core/class/html.formmail.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/langs/en_US/other.lang htdocs/product/class/product.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php		2020-09-12 04:42:59 +02:00
..
admin	Merge branch 'develop' into 13a11	2020-09-09 19:12:08 +02:00
bookkeeping	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-12 04:42:59 +02:00
class	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-09-12 04:42:59 +02:00
closure	add new rule	2020-05-21 00:02:33 +02:00
customer	Scrutinizer Auto-Fixes	2020-09-08 19:27:28 +00:00
expensereport	Scrutinizer Auto-Fixes	2020-09-08 19:27:28 +00:00
journal	Code optimize	2020-09-07 21:38:39 +02:00
supplier	Scrutinizer Auto-Fixes	2020-09-08 19:27:28 +00:00
tpl	add new rule	2020-05-21 15:05:19 +02:00
index.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-06 11:57:31 +02:00