Laurent Destailleur 4c591daab1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/class/html.formprojet.class.php		2018-11-05 10:39:22 +01:00
..
index.php	clean and update code	2018-06-10 18:29:04 +02:00
perday.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 10:39:22 +01:00
perweek.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-11-05 10:39:22 +01:00