Laurent Destailleur 4762bafb02 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php htdocs/mrp/class/mo.class.php		2020-02-12 22:58:37 +01:00
..
pdf_standard.modules.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-12 22:58:37 +01:00