Laurent Destailleur 546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/core/modules/modStock.class.php htdocs/product/inventory/list.php		2018-05-05 14:40:39 +02:00
..
index.php	Fix for multicompany	2018-02-06 10:57:53 +01:00
perday.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-05 14:40:39 +02:00
perweek.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-05-05 14:40:39 +02:00