Laurent Destailleur 358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/customreports.php		2022-03-01 16:48:29 +01:00
..
api_proposals.class.php	Merge pull request #19926 from aspangaro/16a9	2022-01-26 12:06:33 +01:00
propal.class.php	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-03-01 16:48:29 +01:00
propalestats.class.php	fix multiple warnings	2021-10-22 22:15:59 +02:00