Laurent Destailleur 48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/expensereport/class/expensereport.class.php htdocs/projet/element.php htdocs/supplier_proposal/class/supplier_proposal.class.php		2021-02-09 14:08:49 +01:00
..
class	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-02-09 14:08:49 +01:00
stats	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0	2021-01-28 00:23:44 +01:00
tpl	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
card.php	Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES	2021-02-09 13:39:25 +01:00
contact.php	Fix combo to add contact and status of contact on popup	2020-11-30 15:18:58 +01:00
customer.php	The button "Invoice orders" switch to page with lines autoselected.	2020-10-01 18:08:46 +02:00
document.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
index.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
info.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
list.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-01-31 11:54:45 +01:00
note.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00