Laurent Destailleur 8d26329653 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop ... Conflicts: htdocs/core/lib/price.lib.php htdocs/projet/activity/perday.php		2020-07-19 02:24:26 +02:00
..
index.php	add new rule	2020-05-21 15:05:19 +02:00
perday.php	Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop	2020-07-19 02:24:26 +02:00
permonth.php	add new rule	2020-05-21 15:05:19 +02:00
perweek.php	Updated Issue with declared progress	2020-07-12 21:21:34 +01:00