Laurent Destailleur 3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/card.php htdocs/filefunc.inc.php htdocs/langs/fr_FR/admin.lang htdocs/langs/fr_FR/cashdesk.lang htdocs/langs/fr_FR/errors.lang htdocs/langs/fr_FR/products.lang htdocs/langs/fr_FR/projects.lang		2020-03-14 00:22:11 +01:00
..
card.php	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
index.php	FIX #13332 Add more details on screen and help so it is easier to	2020-03-13 18:10:00 +01:00
lines.php	Prepare code for the new pagination possibility	2020-03-13 13:07:11 +01:00
list.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-03-14 00:22:11 +01:00