Laurent Destailleur 69db960a92 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/activity/perweek.php		2018-04-26 18:33:02 +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-04-26 18:33:02 +02:00
perweek.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-26 18:33:02 +02:00