Laurent Destailleur 0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/card.php htdocs/compta/prelevement/line.php htdocs/core/class/commonobject.class.php htdocs/core/lib/functions2.lib.php htdocs/core/tpl/card_presend.tpl.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php		2020-10-22 17:55:38 +02:00
..
admin	Add token on most GET url for admin action	2020-09-30 15:13:28 +02:00
lib	Scrutinizer Auto-Fixes	2020-09-07 08:18:17 +00:00
tabs	Fix GETPOST on 'action'	2020-09-16 19:39:50 +02:00
agentMargins.php	Sanitize sortfield	2020-09-18 17:13:01 +02:00
checkMargins.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-22 17:55:38 +02:00
customerMargins.php	Sanitize sortfield	2020-09-18 17:13:01 +02:00
index.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
productMargins.php	Sanitize sortfield	2020-09-18 17:13:01 +02:00