Laurent Destailleur 838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php		2019-12-14 14:53:49 +01:00
..
class	The variable $notrigger seems to be never defined	2019-11-28 23:11:37 +01:00
card.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-12-14 14:53:49 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00