Laurent Destailleur 3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/prelevement/create.php htdocs/core/class/commonobject.class.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/fourn/commande/dispatch.php htdocs/fourn/product/list.php htdocs/opensurvey/index.php htdocs/ticket/index.php htdocs/ticket/list.php		2019-07-18 18:09:37 +02:00
..
list.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-18 18:09:37 +02:00