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
..
cheque	Fix HTML5	2019-12-12 10:31:08 +01:00
class	doxygen	2019-12-11 22:53:57 +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.php	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
info.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-12-14 14:53:49 +01:00
list.php	Fix HTML5	2019-12-12 10:31:08 +01:00
rapport.php	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
tovalidate.php	Fix HTML5	2019-12-12 10:31:08 +01:00