Laurent Destailleur 9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/accountancy/admin/account.php htdocs/projet/class/task.class.php		2018-05-05 14:34:54 +02:00
..
index.php	Fix for multicompany	2018-02-06 10:57:53 +01:00
perday.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-05 14:34:54 +02:00
perweek.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-05-05 14:34:54 +02:00