Laurent Destailleur ef3d86333c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/activity/perday.php		2017-10-06 12:38:50 +02:00
..
index.php	Fix filter lost	2017-07-31 06:20:32 +02:00
perday.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 12:38:50 +02:00
perweek.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-06 12:38:50 +02:00