Laurent Destailleur 1e13f6fd0f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/resource/class/dolresource.class.php htdocs/resource/list.php		2020-01-29 11:44:04 +01:00
..
dolresource.class.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-01-29 11:44:04 +01:00
html.formresource.class.php	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
index.html